gitignore
Merge branch 'master' of https://github.com/GameHomePC/world

Conflicts:
	.gitignore