Fix player collision
Merge branch 'master' of github.com:Cisco-Meraki-CFG/LightBikes

Conflicts:
	public/js/player.js