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 some force to the bullets
Added pickups (weighted random) to the enemies
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
Added personal scene to work in.
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
Fixed up the lasers etc