Completed project 1.#14

dkotfis wants to merge 2 commits intoCIS565-Fall-2014:masterCIS565-Fall-2014/Project-1:masterfrom

dkotfis:masterdkotfis/Project-1:masterCopy head branch name to clipboard