ship now reacts in a much nicer way. completely changed the acceleration method out.
Merge origin/master

Conflicts:
	assets/js/main.js
	index.html