Test
Merge branch 'master' of https://github.com/ShaneHudson/LeapGame

Conflicts:
	js/player.js