some stuff
Merge branch 'master' of https://github.com/floatec/project-umbrella

Conflicts:
	conf.lua
pause funzt
Merge branch 'master' of https://github.com/floatec/project-umbrella

Conflicts:
	luas/game.lua
pause integrated