working_with_shooting_stuff
made a good amount of shooting stuff
made new scene
omg dunno if this works QQ
Merge branch 'master' into James

Conflicts:
	Unity Project/Assets/scene 1.unity
Merge branch 'James'
Merge remote-tracking branch 'origin/master'