Merge
Merge branch 'master' of https://github.com/Alex-Iefimenko/space_shift

Conflicts:
	Assets/Scene/weapon_testing.unity