now with lightning
water
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