Fixed partTest.cpp

Many function names and parameters have been changed in master.  Fixed
the calls in partTest.cpp that were causing compilation errors after
merging with Master.  partTest.cpp compiles now, but does not run due
to shaders not yet working.
Merging conflicts.

Pulled Particle-Effects-Development to prepare to push.  Merged
conflicts and fixed resulting compilatio errors.
Successful complilation of V, G, and F Shaders.

Successfully compiled a vertex, geometry, and fragment shader into a
program.  Biggest concern here is proof that the GL_EXT_gpu_shader4 and
GL_EXT_geometry_shader4 extensions work.  Next steps will be to render
a single particle, followed by many.
changes to geometry shader

still can't figure out how to pass data into this shader
more changes

things
Particle system will now pass a list of positions to the vshader
Added an object and fixed a thing
Camera position is now sent to the shader for particle system usage
merged conflicts
changed a whole bunch of nonsense
binaries in git ftw
Merge branch 'master' into Particle-Effect-Development

And refactor stuff heavily

Conflicts:
	src/Binaries/partTest.cpp
	src/Classes/Cameras.cpp
	src/Classes/Object.cpp
	src/Classes/ParticleSystem.cpp
	src/Classes/Scene.cpp
	src/Common/InitShader.cpp
	src/include/Object.hpp
	src/include/Particle.hpp
	src/include/ParticleSystem.hpp
	src/include/Scene.hpp
Merge branch 'Particle-Effect-Development'