Updates to the Weapon system and GUI
Updated .gitignore for macs
Merge branch 'alex' of https://github.com/AlexHayton/UnityTestProject2 into alex

Conflicts:
	Assets/TestProject/Scripts/GUI/HUD/GUIEnergyBar.cs
	Assets/TestProject/Scripts/GUI/HUD/GUIHealthBar.cs
	Assets/TestProject/Scripts/Weapons/WeaponScript.cs
Health Pills float towards you when you're damaged
Updates to prefabs.
Rebaked the nav mesh in the scene