pushing to github
Merge branch 'master' of github.com:ashleyrevlett/TerrainGenerator

* 'master' of github.com:ashleyrevlett/TerrainGenerator:
  Initial commit

Conflicts:
	.gitignore
	README.md
pushing to git
setting up gitignore