Completed project#3

caiwjohn wants to merge 3 commits intofdac18:masterfdac18/MiniProject2:masterfrom

caiwjohn:mastercaiwjohn/MiniProject2:masterCopy head branch name to clipboard