Project_2 finished#18

Open

zxm5010 wants to merge 2 commits intoCIS565-Fall-2014:masterfrom

Commits on Sep 29, 2014

almost finished
zxm5010
committed

Commits on Sep 30, 2014

Finished project
zxm5010
committed