some collision shit
Merge branch 'master' of github.com:xavierdhjr/cse472-project2
Merge branch 'master' of github.com:xavierdhjr/cse472-project2

Conflicts:
	ParticleSystem/ChildView.cpp
	ParticleSystem/ParticleSystem.vcxproj
	ParticleSystem/ParticleSystem.vcxproj.filters
adding color back in