menu things
Merge branch 'master' of https://github.com/fizzoo/Fick-Monster

Conflicts:
	src/inda13projekt/Game.java
	src/inda13projekt/OverWorldWindow.java