Use ints to specify positions
Merge branch 'master' into Logic

Conflicts:
	src/main/java/dungeon/game/LogicHandler.java