Merge pull request #9 from mcifelli/master

pull request
trying to add web functionality

not finished yet
web app attempt#2

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

Conflicts:
	src/edu/ycp/cs320/magicprogram/shared/Creep.java
Merge remote-tracking branch 'pholtz/master'