fixed that laser SHIT MOTHERFUCKERSS!!!!!!!!!!!!!!!!!!
Merge branch 'odkken2' of https://github.com/AlexHayton/UnityTestProject2 into odkken2

Conflicts:
	Assets/TestProject/Prefabes/Weapons/Muzzle Effects/Rifle Muzzle.prefab
	Assets/TestProject/Scenes/Ship.unity