additions to morphing code, and intial mapping code
Updating README with documentation.
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Added the official ftime unform used by Erix 1337 h@X
MONOLITH: Romantic candle flicker function

and a single-light phong model, disableable with a boolean uniform ("letMeSeeThatPhong" //pha phong phong phong)
Merge branch 'master' of github.com:UMLComputerGraphics/GraphicsProject
Fixed includes for ImagMagick for mac and Makefile
Pass by value ==> pass by const reference in obj loader, and fix warnings.
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Enabling -Wall and fixing all warning messages.
merging and fixing warnings.
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
additions to morphing for distance from the center, more to come for "turning" matched triangles
Condensing min/max finding for Object
Documentation updates
Documentation for dumb.cpp and terrain.cpp
Fixed Rotation bug
Texture class documentation.
Documentation for Timer.
more code cleanup, added ability to use shaders

shaders currently apply to the whole scene
i don't know how to make it apply to just certain stuff.