Half started the renderer class
Finished Renderer
Merge remote-tracking branch 'origin/alex'
Merged Master with Alex