wrty
Merge pull request #5 from dbosenba/master

pull
creep waypoint
Merge remote-tracking branch 'mcifelli/master'
update GWT
added hp to creep
added grid
Merge remote-tracking branch 'pholtz/master'
ensure test directory exists
line endings?
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