commit
merge with Daniel (add GWT UI)
added button

Merge remote-tracking branch 'dbosenba/master'

Conflicts:
	magicprogram/test/edu/ycp/cs320/magicprogramtest/TestCreep.java
Merge remote-tracking branch 'pholtz/master'