just trying to do a double jump obj
Merge branch 'master' of https://github.com/sgerin/procjam2014

Conflicts:
	main.lua