first commit
implemented most of the game's baic function
commit
Merge branch 'master' of https://github.com/rufuszhu/cs314

Conflicts:
	cs314 p1.sdf
	ipch/cs314 p1-6cdddd27/cs314 p1-2fc1463b.ipch
	p1.cpp