Merge branch 'master' into Rami
Merge branch 'master' into Levels
Merge remote-tracking branch 'refs/remotes/origin/odkken2' into Levels
added healing zone models and made a prefab for it( in preperation for droppable medpack by player )
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Added new Enemy to spawner (searching for enemies now, doesnt look better yet)
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