Merge branch 'opengl-2.1' into shadows
edit makefile
now with lightning
water
shadows
Merge branch 'master' into opengl-2.1

Conflicts:
	Makefile
	shaders/Sun.vert
	src/deer.cpp
	src/deer.h
	src/game.cpp
	src/game.h
	src/graphics/texture.h
	src/tree.cpp
fixed merge conflict
texture.vert uses bones
Merge branch 'master' into lighting

Conflicts:
	Makefile
	shaders/Sun.vert
	src/deer.cpp
	src/deer.h
	src/game.cpp
	src/game.h
	src/graphics/texture.h
	src/tree.cpp
merge conflicts
Merge branch 'lighting'

Conflicts:
	Makefile
	shaders/Sun.frag
	shaders/Sun.vert
	shaders/Texture.frag
	src/deer.cpp
	src/deer.h
	src/game.cpp
	src/game.h
better leaning
merging