Did cloud, horizontal billboard, scaled billboard, extended particle system
Merge branch 'master' of https://github.com/xiecheng59/cs123_final

Conflicts:
	src/TornadoParticleSystem.cpp
	src/scene.cpp