jkhg
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/src/edu/ycp/cs320/magicprogram/shared/Point.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Structure.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameController.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java