Added stop upon collision with ground
Merge branch 'master' into daniel

Conflicts:
	js/FloatyDuck.js
	style.css