Cleaned up some code widths (ctrl-shift-F)
Merge remote-tracking branch 'origin/master'

Conflicts:
	FlatDungeonWorld/src/DungeonGame.java