GitFail
Merge branch 'master' of https://github.com/MrHangover/DoominionsOfAaldor

Conflicts:
	Assets/Prefab/BlueMage/BlueMage.prefab