Finish Project1,Bo Zhang#5

wulinjiansheng wants to merge 4 commits intoCIS565-Fall-2014:masterCIS565-Fall-2014/Project-1:masterfrom

wulinjiansheng:masterwulinjiansheng/Project-1:masterCopy head branch name to clipboard