Merge pull request #40 from DevenSmith/master

last build dont break
zx
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
stevemn
Merge pull request #41 from patrick-ryan-aie/master

stevemn
my name
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Toon Particles - Fire Collection/Materials/ToonParticle - FireParticle.mat
	TrickyNinja/ProjectSettings/TagManager.asset
	TrickyNinja/TrickyNinja.userprefs
hi?
steven
Merge remote-tracking branch 'upstream/master'