updated GUI
added a queue
gameview class
some changes to entry point (canvas stuff)
Merge branch 'master' of git@github.com:pholtz/magicprogram.git

Conflicts:
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
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
commit
commit
gameview update
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
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
fixed creep test class after changes to creep.java
asdf
asdf
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
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
more gameview work
accidentally changed packages into folders
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/test/edu/ycp/cs320/magicprogramtest/TestCreep.java
	magicprogramUI/.classpath
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
added selector and grid to GameView
Merge remote-tracking branch 'mcifelli/master'

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