replaced memory with full path for creep
worked on creep button
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Board.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogramUI/.classpath
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java