Fixing some Shooting stuffz
Merge branch 'master' of https://github.com/comp476-team3/trigonometric-anomaly

Conflicts:
	Trigonometric Anomaly/Assets/main.unity
	Trigonometric Anomaly/Library/CurrentLayout.dwlt
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-CSharp.dll
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Trigonometric Anomaly/Library/assetDatabase3
	Trigonometric
Anomaly/Library/metadata/04/043c02dc3f6dd0f4db52c46c132478e0
	Trigonometric
Anomaly/Library/metadata/f6/f616f18c4a451fa49aee89160f45df35
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs