started texturing
Merge branch 'master' of github.com:real-time-rendering/webgl-a1
added bumpmapping for well, improved glow-blur-kernel (less squarish)
merged changes (bumpmapping and animation)

Merge branch 'master' of github.com:real-time-rendering/webgl-a1

Conflicts:
	lesson04/uebung5/uebung5.js