Some little things
Merge branch 'master' of https://github.com/slanger/RPG

Conflicts:
	rpg/src/com/me/rpg/RPG.java