Imported the player model from Maya, wired it up
Some cleanup?
Lasers
Lasers
Lasers!
Makes mouse point directly in front of player
Merge branch 'refs/remotes/origin/alex2'
Remove unityProj files.
Updated the player prefab - trying to get the laser controller working.
good
wep twek
Updated GitIgnore
Merge branch 'alex2' into odkken2
Fixed some muzzle stuff.
Merge branch 'alex2' into odkken2
Improvements to the muzzle flash animation
Updated some more prefabs.
Set up the selected border with a transparency.
Added the weapon selection GUI.
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