Updated something
Merge branch 'dev' of https://github.com/danielkinjerski/GameJam2012-sept- into dev

Conflicts:
	GameJam/Assets/Scenes/Base.unity
	GameJam/Assets/Scripts/Player.cs

	modified:   GameJam/Assets/Prefabs/Cameras.prefab
	modified:   GameJam/Assets/Prefabs/EndGoal.prefab
	modified:   GameJam/Assets/Prefabs/GameManager.prefab
	modified:   GameJam/Assets/Prefabs/MainScreen.prefab
	modified:   GameJam/Assets/Prefabs/Player.prefab
	new file:   GameJam/Assets/Scripts/EndGame.cs
	new file:   GameJam/Assets/Scripts/EndGame.cs.meta
	modified:   GameJam/Assets/Scripts/GameManager.cs
	new file:   GameJam/Assets/Scripts/OffsetVanishingPoint.cs
	new file:   GameJam/Assets/Scripts/OffsetVanishingPoint.cs.meta
	modified:   GameJam/Assets/Scripts/Player.cs
	new file:   GameJam/Assets/Textures/JumpSwith GUI/A.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/A.png.meta
	modified:   GameJam/Assets/Textures/JumpSwith GUI/Atlas/JumpSwitch Atlas.png
	modified:   GameJam/Assets/Textures/JumpSwith GUI/Atlas/JumpSwitch Atlas.png.meta
	modified:   GameJam/Assets/Textures/JumpSwith GUI/Atlas/JumpSwitch Atlas.prefab
	new file:   GameJam/Assets/Textures/JumpSwith GUI/Grid.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/Grid.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/LB.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/LB.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/LT.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/LT.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/O.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/O.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/Ouya.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/Ouya.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/RB.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/RB.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/RT.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/RT.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/U.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/U.png.meta
	new file:   GameJam/Assets/Textures/JumpSwith GUI/Y.png
	new file:   GameJam/Assets/Textures/JumpSwith GUI/Y.png.meta
	modified:   GameJam/JumpSwitch_Dirty_Alpha.apk
	modified:   GameJam/ProjectSettings/EditorBuildSettings.asset
	modified:   GameJam/ProjectSettings/TagManager.asset