level classes for the background (i.e. Terrain)
Merge remote-tracking branch 'pholtz/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Level.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java