commmitcommitcomim
t
added view
Merge remote-tracking branch 'pholtz/master'

Conflicts:
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java