ok
Merge branch 'master' of https://github.com/joakim-d/ropeboy

Conflicts:
	Map.lua
	Sprite.lua
	main.lua
OK