changes
changes
Merge branch 'master' of https://github.com/ck1456/Agonizer
Merge branch 'master' of https://github.com/genghis88/Agonizer

Conflicts:
	src/hps/nyu/fa14/Agonizer.java
	testsrc/hps/nyu/fa14/AgonizerTest.java