Merge pull request #38 from RynsArgent/master

merge
sub-stage. prep for merge. Updated & cleaned levels
Merge https://github.com/emfb760/brain-game
merge with brandon
slider for initial speed, scoring rubric in place, player progress saves
preparing to merge with holdout
Merge https://github.com/emfb760/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0.xcodeproj/project.pbxproj
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Tunnel.cpp
score display in level selection and small fix with speed slider
Merge branch 'master' of https://github.com/RynsArgent/brain-game
New Swipe Controller
Merge https://github.com/emfb760/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Tunnel.cpp
merge
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)
ship offset from cam, tutorial manager, landscape
fixed exit animation, began adding new timewarp animation