gravity mainly working with ramp :D
no message
Merge branch 'master' of https://github.com/amyzou/RubeWorks

Conflicts:
	app/assets/javascripts/controller.js