Removed controllertest from makefile
Standardized defines for Camera
Standardized formatting for GameTime
Water Shader Is Now Passed in as an Argument
updated README.md