Matt adds a bug too!

Changed gravity to something dumb.
Merge remote-tracking branch 'origin/e155' into e155

Conflicts:
	js/main.js

Resolved gravity.