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

Conflicts:
	src/terrain/terrain_mesh_handler.h
Fucking github