5-second-rule/rendering-framework — pull request #19 by Shukumei (2014-05-05 02:48:50+00:00)
Title: Merged my changes + ShaderLoader + VertexAnimations

Since apparently I missed that my shaderloader merge didn't complete (my bad), I had already made too many changes since then to do a very clean merge.That's why I took the current state of master and worked in all of my changes by hand to effectively merge both my shader loader and my vertexAnimations into master. I also added the recent model files and a timer class to calculate fps and elapsed time.