commit
Merge branch 'master' of https://github.com/pholtz/magicprogram.git

Conflicts:
	test/edu/ycp/cs320/magicprogramtest/TestRectangle.java
Merge branch 'master' of https://github.com/pholtz/magicprogram.git
commit
Merge branch 'master' of https://github.com/pholtz/magicprogram.git
added old test classes