update ?
Merge branch 'master' of github.com:xavierdhjr/cse472-project2

Conflicts:
	ParticleSystem/ParticleEmitter.h
Merge branch 'master' of github.com:xavierdhjr/cse472-project2
adding emitter