intermediary commit
tons of stuff
Merge branch 'master' of https://github.com/RynsArgent/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0.xcodeproj/project.pbxproj
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/EngineStage.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/HudStage.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/HudStage.h
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Player.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Tunnel.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Util.h
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/media/materials/scripts/GeneralGUI.material
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/media/materials/textures/hud.png
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/media/materials/textures/level_menu.jpg
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/EngineStage.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/HudStage.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/HudStage.h
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Player.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Tunnel.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/TutorialManager.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Util.h
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/scripts/GeneralGUI.material
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/scripts/GeneralTutorial.material
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/textures/TutorialSlides/TextboxHoldout1.png
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/textures/hud.png
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/textures/level_menu.jpg
Merge branch 'master' of https://github.com/RynsArgent/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0.xcodeproj/project.pbxproj
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/EngineStage.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/HudStage.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/HudStage.h
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Tunnel.cpp
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Util.h
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/media/materials/scripts/GeneralGUI.material
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/media/materials/textures/hud-eblue_right.png
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/EngineStage.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/HudStage.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/HudStage.h
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Tunnel.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Util.h
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/scripts/GeneralGUI.material
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/materials/textures/hud-eblue_right.png
Merge branch 'master' of https://github.com/RynsArgent/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Pod.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/media/models/FuelCell/4pointStarComplex.mesh
Merge branch 'master' of https://github.com/RynsArgent/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Ogre3DSeparateBuildSpace/Vinezors2.0/Vinezors2.0/Player.cpp
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS/Player.cpp
Merge branch 'master' of https://github.com/RynsArgent/brain-game

Conflicts:
	Ogre3DSeparateBuildSpace/VinezorsiOS/VinezorsiOS.xcodeproj/xcuserdata/phungc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist