new file:   Assets/Scripts/AutoLevel.cs
	new file:   Assets/Scripts/AutoLevel.cs.meta
	new file:   Assets/Scripts/CopyRotation.cs
	new file:   Assets/Scripts/CopyRotation.cs.meta
	new file:   Assets/Scripts/ExampleClass.cs
	new file:   Assets/Scripts/ExampleClass.cs.meta
	new file:   Assets/Scripts/GUICrosshair.cs
	new file:   Assets/Scripts/GUICrosshair.cs.meta
	new file:   Assets/Scripts/ModifiedSimpleSmoothMouseLook.cs
	new file:   Assets/Scripts/ModifiedSimpleSmoothMouseLook.cs.meta
	new file:   Assets/Scripts/MouseLook.cs
	new file:   Assets/Scripts/MouseLook.cs.meta
	new file:   Assets/Scripts/MoveRig.cs
	new file:   Assets/Scripts/MoveRig.cs.meta
	new file:   Assets/Scripts/PlayerController.cs
	new file:   Assets/Scripts/PlayerController.cs.meta
	new file:   Assets/Scripts/SimpleSmoothMouseLook.cs
	new file:   Assets/Scripts/SimpleSmoothMouseLook.cs.meta
	new file:   Assets/Scripts/Tilt.cs
	new file:   Assets/Scripts/Tilt.cs.meta
	new file:   Assets/Scripts/VirtualJoystickRegion.cs
	new file:   Assets/Scripts/VirtualJoystickRegion.cs.meta
	new file:   Crosshair.png
	new file:   Crosshair.xcf
	new file:   ProjectSettings/AudioManager.asset
	new file:   ProjectSettings/DynamicsManager.asset
	new file:   ProjectSettings/EditorBuildSettings.asset
	new file:   ProjectSettings/EditorSettings.asset
	new file:   ProjectSettings/GraphicsSettings.asset
	new file:   ProjectSettings/InputManager.asset
	new file:   ProjectSettings/NavMeshLayers.asset
	new file:   ProjectSettings/NetworkManager.asset
	new file:   ProjectSettings/Physics2DSettings.asset
	new file:   ProjectSettings/ProjectSettings.asset
	new file:   ProjectSettings/QualitySettings.asset
	new file:   ProjectSettings/TagManager.asset
	new file:   ProjectSettings/TimeManager.asset
	new file:   Test.apk
	new file:   TunnelFlyer
	new file:   UpgradeLog.htm
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore