changed many instance variables for particle, water, and mucus. adjusted
particlesystem to accomodate changes
changes with water and mucus implementation
added glaux
Merge branch 'master' of github.com:h-wang94/cs184final

Conflicts:
	Bucket.cpp
	Particle.cpp
	Particle.h
	ParticleSystem.cpp
	SpatialGrid.cpp