Merge branch 'master' into alex2
Added TeamHandler to player and enemies
Merge branch 'master' into alex2

Conflicts:
	Assets/TestProject/Prefabes/Enemy/Enemy.prefab
	Assets/TestProject/Prefabes/Weapons/Pistol Bullet.prefab
	Assets/TestProject/Scenes/test.unity
Merge branch 'master' of github.com:AlexHayton/UnityTestProject2