Terrain added
Merge branch 'master' of https://github.com/Codas/HWorldGen

Conflicts:
	Main.hs