ammo 1
Merge branch 'master' of https://github.com/maxstauss/gtr

Conflicts:
	src/rogue/creature/Player.java