Some little changes
Merge branch 'master' of https://github.com/loadtrein/fractalTerrain

Conflicts:
	src/shaders/terrain_shader.h