First commit
Merge branch 'master' of https://github.com/Coeuvre/TerraCraft

Conflicts:
	.gitignore