work done on enemies
endofday
Merge remote-tracking branch 'origin/master' into Branch

Conflicts:
	TrickyNinja/Assets/Toon Particles - Fire Collection/Materials/ToonParticle - 5xParticle.mat
	TrickyNinja/Assets/Toon Particles - Fire Collection/Materials/ToonParticle - FireParticle.mat
	TrickyNinja/Assets/Toon Particles - Fire Collection/Materials/ToonParticle - Glow Soft.mat
	TrickyNinja/Assets/Toon Particles - Fire Collection/Materials/ToonParticle - Stretch.mat
	TrickyNinja/TrickyNinja.userprefs
checking master
Merge remote-tracking branch 'origin/Branch'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs