rocketMan
Merge remote-tracking branch 'origin/master'
fcking conflicts

Conflicts:
	mainproject/Assets/Scenes/mission 1.unity
	mainproject/Assets/Scripts/Mission 1/CameraShake.cs
	mainproject/Library/CurrentLayout.dwlt
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	mainproject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	mainproject/Library/assetDatabase3
	mainproject/Library/expandedItems
	mainproject/Library/guidmapper
	mainproject/Library/metadata/29/29a982d39f58c644bb19d88f1d67565a
	mainproject/Library/metadata/71/7115a19ac7e9be84d9b93d00fa89cfc2
	mainproject/Library/metadata/7a/7afb8c0f6fe4a974fb0f55386248ea56
	mainproject/Library/metadata/87/8769af03d751a26429e11304b328c40e
	mainproject/Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	mainproject/Library/metadata/af/afd203e00da88b34bbd942769eb978fd
	mainproject/Library/metadata/be/be6d97eb60aaced4fa309f111e2edcf2
	mainproject/Library/metadata/e8/e83c573f80515b145a5531eaa82bb943
	mainproject/Library/metadata/ff/ff1491baf07cabe44967b60b72e8140f
	mainproject/mainproject-csharp.sln
	mainproject/mainproject.sln
	mainproject/mainproject.userprefs