Commit before merging... with myself???
Merge branch 'master' of https://github.com/elliotfiske/Awesome-Rogue-Java

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