Сохранение перед ужасом
Рефактор 1 (не запускается)
Подправил глюк с именами в PlayerController
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Shooter/Scripts/MainMenu.js
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
git add CompilationCompleted.txt
Временный
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Library/ScriptMapper
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper