asdf
asdf
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/test/edu/ycp/cs320/magicprogramtest/TestCreep.java
	magicprogramUI/.classpath
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java