Menu awesomity
Merge branch 'master' of github.com:Nukesor/ggj14

Conflicts:
	src/states/gameState.lua
	src/systems/logic/keyDownSystem.lua