test git

1ºst attempt to commit
Merge branch 'master' of https://github.com/kafeijao/WorldRegen

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/kafeijao/WorldRegen