Prepare for merge
Merge branch 'master' of https://github.com/Haakon-Lotveit/BergenGameJam

Conflicts:
	src/ghp/tilegame/main/levels/Level.java