added files for creating textures, some pong shaders
added comments and original assigment
added a texture / changed the texture class to work with OpenGL 3.2
fixed sphere.obj
fixed shader to work with OpenGL 3.2
removed calls to fixed-funtion-pipeline in texture helper class
added texturing and phong shading
drawing of earth
Merge commit '547820226ac4e72198f2df7eaa4c8ca8a60515d7'

* commit '547820226ac4e72198f2df7eaa4c8ca8a60515d7':
  Update README.md
  Update README.md
  Update main.cpp
  added call to bind VAO at beginning of draw()
  updated comments for vertex attribute pointers
  fixed linux project
  fixed sphere.obj

Conflicts:
	src/main.cpp
Merge branch 'master' of https://github.com/bestimmaa/CGFramework

* 'master' of https://github.com/bestimmaa/CGFramework:
  added src folder to include paths in VS project
  fixed bug in VS2013 project: the build folder is now win/CGFramework/build/CONFIG to avoid errors when launching the exe from within VS with a relative path (xyz/.../.../build/CGFramework.exe)
  added copy ressources script to post-build settings
  added VS2K13 project for windows
added tangent generation for normal mapping to gloost:mesh / renamed variables in shader
renamed eye direction in shaders
passing light position as uniform to shaders
added outputs to vertex shader for eye and light direction in tangentspace / added view matrix uniform
added normal map to ressources / calculation of bumped normal in fs
added
stuff
bumping
bump and gloss mapping
bump and gloss mapping added. texture mapping still a bit ugly. Using a cubemap or duplicated geometry in the model should fix this.