project 5 submission#8

Open

YingtingXiao wants to merge 8 commits intoCIS565-Fall-2013:masterfrom

YingtingXiao:master

Commits on Nov 5, 2013

done with the basic stuff!
lucyxiao
committed

Commits on Nov 9, 2013