11.1
Merge https://github.com/BSCheshir/terrariaWorlds

Conflicts:
	world1.wld
	world1.wld.bak