Merge branch 'master' of https://github.com/elchan/Terrain_Generation

Conflicts:
	Terrain_Generation.v11.suo
	bin/data/geo.geometryshader
	bin/data/shader.frag
	src/Terrain.hpp
	src/ofApp.cpp
	src/ofApp.h