Added new vertex and fragment shaders
Changed box to object
Updated shaders to use textures

Updated the vertex and fragment shaders to used textures now.
Also seperated the content loading calls in to a seperate function.
Rendered multiple objects
Merge branch 'Exercise20.2' into development
Merge branch 'development'
Merge branch 'Exercise22' into development
Merge branch 'development'