перед пуллом
Merge branch 'master' of github.com:saotele2/shooter

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

Conflicts:
	shooter/Library/assetDatabase3
исправили 2 ошибки
.gitignore is now working
Добавил сам гитигнор
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	.gitignore
	gitignore.cmd
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-CSharp.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Resources/prefabs/weapons.meta
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
Добавил BattleModel.js и BattleWaveModel.js