no message
Merge branch 'master' of https://github.com/Onimishra/Particle-System

Conflicts:
	Particle-System/Emitter.ts