added selector and grid to GameView
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java