Commiting to pull
Merge branch 'master' of https://github.com/manakpp/Mage-Command

Conflicts:
	Project/Assets/Scenes/Game.unity
Merge branch 'master' of https://github.com/manakpp/Mage-Command

Conflicts:
	Project/Assets/Scenes/Game.unity
Work in progress
Merge branch 'master' of https://github.com/manakpp/Mage-Command

Conflicts:
	Project/Assets/Scripts/Game/Enemies/EnemyBehaviour.cs
Merge branch 'master' of https://github.com/manakpp/Mage-Command
u
Merge branch 'master' of https://github.com/manakpp/Mage-Command

Conflicts:
	Project/Assets/Scripts/Game/Enemies/EnemyBehaviour.cs
In progress
Merge branch 'master' of https://github.com/manakpp/Mage-Command

Conflicts:
	Project/Assets/Scenes/Game.unity
	Project/Assets/Scripts/Game/Game.cs