art changes?
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/Assets/Prefabs/Enemy/SwordMonkPrefab.prefab
	TrickyNinja/Assets/Scenes/MainLevel.meta
	TrickyNinja/Assets/Scenes/MainLevel.unity
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset
	TrickyNinja/TrickyNinja.userprefs