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
steven
Merge remote-tracking branch 'upstream/master'
Merge pull request #42 from DevenSmith/master

This could be the last pull request ever