Commit before merge
Merge branch 'master' of https://github.com/elliotfiske/Awesome-Rogue-Java

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