Updates to the Weapon system and GUI
Added new files to gititnore
made the ship level a bit bigger
added progrids free ( Grid plugin ) ask Rami if you need help
meta files.
Removed the unityproj files.
Merge branch 'refs/heads/Rami'

Conflicts:
	Assets/6by7/ProGrids.meta
	Assets/6by7/ProGrids/Scripts.meta
	Assets/Image Processing.meta
	Assets/Image Processing/Textures.meta
	Assets/TestProject/Models/Player.meta
Added James' level tiles with their textures and right scale under 3d models/level tiles/Labs
Added gizzmo box to door
added hp and energy pickups, and tied the HP to current existing script and changed value of each pick to 10hp
added multiple hp pickups to ship scene
fixed physics on some of the stuff on there, the chair dosn't rotate in air once its shot anymore.
read my posts on campfire for more.
small tweaks to the shotgun, read previews changelog for more
Merge remote-tracking branch 'refs/remotes/origin/Rami'

Conflicts:
	Assets/TestProject/Scenes/Ship.unity
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
Merge remote-tracking branch 'remotes/origin/master' into odkken2

Conflicts:
	Assets/3D Models/Items.meta
	Assets/3D Models/Items/Energy Pill/Materials.meta
	Assets/3D Models/Items/HP Pill/Materials.meta
	Assets/Image Processing/Textures.meta
	Assets/TestProject/Models/Player.meta
	Assets/TestProject/Prefabes/Weapons/Bullets/Materials/bullet trace 4.mat
	Assets/TestProject/Scenes/Ship.unity
	Assets/TestProject/Scripts/Animation.meta