Fixed menu
Merge branch 'master' of https://github.com/nthiebes/GameJam

Conflicts:
	css/style.css