Переименовал medikit в medkit
0
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
0
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/Library/assetDatabase3
Merge branch 'master' of github.com:saotele2/shooter
поправил реген щита