I added some things
Merge branch 'master' of https://github.com/paranoidgabe/TerrainGenerator

Conflicts:
	Makefile
	main.cpp