Merge pull request #38 from RynsArgent/master

merge
Merge branch 'master' of https://github.com/RynsArgent/brain-game
New Swipe Controller
Merge https://github.com/animekraxe/brain-game
Merge with Brandon/Emmanuel.
- Reorganized Brandon's ship positioning in offsetShip in player
	(resolves conflict with end animation)
- handlePan calls two event handlers to allow the slider to work again
- fixed bound case with slider
- OS X version still has arrow key controls (#defs added)