Workin on normal mushrooms
Merge branch 'master' of github.com:elliotfiske/Awesome-Rogue-Java

Conflicts:
	workspace/AwesomeRogue/src/com/nightfall/awesomerogue/Enemy.java