0
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
0
Вынес NMRule на главный экран
Добавил плашечки
пустой
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
удалил скайбоксы