rollback
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~6353f7f1284bd9d24ffd66a64e7fb587b538502b.meta
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~HEAD.meta
	TrickyNinja/Assets/Scripts/PlayerScriptDeven.cs
	TrickyNinja/TrickyNinja.userprefs