need test class
Merge branch 'master' of git@github.com:dbosenba/magicprogram.git

Conflicts:
	src/edu/ycp/cs320/magicprogram/Circle.java
	src/edu/ycp/cs320/magicprogram/castleview.java
	src/edu/ycp/cs320/magicprogram/game.java