ai stuff
Merge branch 'master' of https://github.com/jimmy04500/Rougue

Conflicts:
	Assets/Prefabs/Player/Mage WithCam.prefab
	Assets/Scenes/Game.unity
	ProjectSettings/TagManager.asset