-up/down movement, ...
Merge branch 'master' of github.com:dmke/GGJ2013

Conflicts:
	src/custom/hearty.lua
	src/custom/main.lua
	src/custom/myObstacles.lua