Shader loading and compiling
Scene loading
Merge branch 'master' into hello_triangle
Shader program creation
Merge branch 'master' into hello_triangle
Scene rendering
Merge remote-tracking branch 'origin/temp_merge' into hello_triangle
Merge remote-tracking branch 'origin/temp2' into hello_triangle
Merge remote-tracking branch 'origin/temp3' into hello_triangle
Merge remote-tracking branch 'origin/temp4' into hello_triangle
Merge remote-tracking branch 'origin/temp5' into hello_triangle
Merge remote-tracking branch 'origin/master' into hello_triangle
Merge remote-tracking branch 'origin/master' into hello_triangle
Merged master into hello_triangle, resolved conflict using master to override
Merge remote-tracking branch 'origin/master' into hello_triangle
Created FPSCounter class
Added to FPSCounter
Added again to FPSCounter
Added FPS counter to Renderer