x
Merge branch 'master' of https://github.com/lordubbe/OOSE_HandIn

Conflicts:
	Assets/Mihai/Character/FirstPersonCharacterMove.cs
	Assets/Mihai/Character/HeroAttack2/HeroMelee.cs
	Assets/Mihai/Enemy/Enemy 1.0/CharacterStats.cs
	Assets/Mihai/Enemy/Enemy 2.0/AI/AnimationController.cs