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

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