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

Conflicts:
	player2.plr
	player2.plr.bak