StevenWork?
Merge branch 'master' of https://github.com/ScrambledEgge101/TrickyNinja-2

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
klsdaj