Old
Merge https://github.com/Blrp/TerrainGeneration

Conflicts:
	height.py
	img.png