Created gitignore for mac metadata file
Added initial Particle header
Preliminary particle class implementation.
added particle model

flat plane with UVs for a square texture
copied the model
Updated constructor to Particle.cpp
Merging with last semester's gitignore.
Adding valgrind suppression file.
Adding global settings object.
Adding multi-shader test shaders.
Implementing multi-shader support.

modified:   Binaries/Makefile
new file:   Classes/Grinstein.cpp
new file:   Binaries/ds.cpp
new file:   include/Grinstein.hpp
	Added a [d]ual[s]hader test binary, and a new global management object. (Name pending ...!)

new file:   Common/glut_callbacks.cpp
new file:   include/glut_callbacks.h
	Factored out some commonly used glut callbacks for keybindings and so forth.

deleted:    Binaries/morph.cpp
deleted:    Binaries/morphlite_keybindings.c
	Redundant and no longer needed.

modified:   include/platform.h
	Debugging fixes: Disabled experimental features. (Less bugs in valgrind)

modified:   Classes/Cameras.cpp
modified:   Classes/Object.cpp
modified:   Classes/Scene.cpp
modified:   Common/InitShader.cpp
modified:   include/Scene.hpp
	Core changes to support per-object shaders.

modified:   Binaries/morphlite.cpp
modified:   Binaries/terrain.cpp
	Compatibility updates for the new global settings object.
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Multi-shader implementation, Global settings singleton.

Added fixes for multi-shaders, implemented a global settings object,
and updated binaries to reflect the new usage.

Sorry if this breaks your WIP! (It probably will!)
Commit to publish banch

Files changed: Binaries/Makefile, Classes/Particle.cpp,
include/Particle.hpp, include/Scene.hpp
New file: Binaries/partTest.cpp
Resolving merge conflicts
Added "glut_callbacks.h" to partTest.cpp.  Made InsertObject in Scene.hpp public.
Fixed segfaults when running partTest

partTest.cpp is a test driver for particle system.  We were running
into segfaults when trying to run the binary.  After making appropriate
changes, the binary will now run.  The particle object, however, does
not render. That's next.
minor changes to partTest

didn't fix anything
Preliminary morphing functionality. If models are different size, we artificially add to the smaller model until we have two of the same size. Next step should be to convert the draw format to glTriangleStrip to prevent holes from occuring. Therefore we should also add functionality to convert an existing set of glTriangle proints to glTriangleStrip points. There must be something out there to do this.
Tidying dual-shader example.