перед мёрджем
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Shooter/Scripts/Recount.js
	shooter/Library/assetDatabase3
Разбираемся с оружием
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
Перед мёрджем
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Shooter/Scripts/SceneBuilder.js
	shooter/Library/assetDatabase3
перед мёрджем
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper