Merge pull request #2 from dbosenba/master

update work from 2/14/13
Merge pull request #3 from mcifelli/master

Pull Request
Merge pull request #5 from CS320/master

Pull Request
Merge pull request #6 from mcifelli/master

pull request
commit
Merge pull request #7 from mcifelli/master

pull request
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
Merge pull request #8 from mcifelli/master

pull request
commit
Merge branch 'master' of https://github.com/pholtz/magicprogram.git
added old test classes
Merge pull request #9 from pholtz/master

update master