changes
Merge branch 'master' of https://github.com/Johangsl/Shoot-Em-Up

Conflicts:
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/06/063249e6cc3b6024bbacba7ee2006a0e
	Temp/__EditModeScene