updated readme
fuck you daniel
Merge remote-tracking branch 'pholtz/master'

Conflicts:
	bin/edu/ycp/cs320/magicprogram/TD.gwt.xml
	test/edu/ycp/cs320/magicprogramtest/TestCreep.java