Merge branch 'master' into Rami
Merge branch 'master' into Levels
Merge branch 'master' into odkken2
Merge remote-tracking branch 'refs/remotes/origin/odkken2' into Levels
Made lasers a little more visible
Made the enemy health bars less annoying
Made bullets more visible
Made an energyItem class
Corrected spelling on HealthItem
Wired up energy pickups
added healing zone models and made a prefab for it( in preperation for droppable medpack by player )
Added some force to the bullets
Added pickups (weighted random) to the enemies
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Merge remote-tracking branch 'refs/remotes/origin/master' into alex

Conflicts:
	Assets/TestProject/Scenes/Ship.unity
	Assets/TestProject/Scripts/Pickupables/EnergyItem.cs
add new lvel
healing zone prefab fixed
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Added personal scene to work in.
Merge branch 'Rami' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Merge remote-tracking branch 'refs/remotes/origin/Levels' into alex
Merge branch 'refs/heads/Rami' into alex

Conflicts:
	Assets/TestProject/Prefabes/Enemy/EnemyNew.prefab
	Assets/TestProject/Scenes/Ship.unity
	ProjectSettings/TagManager.asset
Fixed some stuff