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
Started particle system. Redefined particle as a stand alone class (no inheritence)
Merge Conflicts.
temp

ignore me
added option enum to addobject to specify the type to be added
Updates to Particle/Particle System
changes to things
merged conflicts
fixed miniscule nonsense
Updated Particle.cpp ParticleSystem.cpp
Merge branch 'Particle-Effect-Development' of https://github.com/UMLComputerGraphics/GraphicsProject into Particle-Effect-Development
More updates to particles
made InsertObject smarter
Created f/g/vParticle.glsl
fixed active object null dereference and hot-fixed GL_GEMOETRY_SHADER undefined compile error
adding exception handling to keyboard callbacks