Local changes after initial summer programs. Added PRPLD21 as oficial PRPLD volunteer operator within the MC server.
Merge branch 'master' of https://github.com/prpld/PRPLDMinecraft

Conflicts:
	.gitignore
	Creative/uid.dat
	README.md
	banned-ips.txt
	banned-players.txt
	ops.txt
	plugins/Essentials/spawn.yml
	plugins/Essentials/userdata/bravenewworld78.yml
	plugins/Essentials/userdata/killerbean0.yml
	plugins/Essentials/userdata/prpld02.yml
	plugins/Essentials/userdata/prpld03.yml
	plugins/Essentials/userdata/prpld04.yml
	plugins/Essentials/userdata/prpld05.yml
	plugins/Essentials/userdata/prpld06.yml
	plugins/Essentials/userdata/roboashy.yml
	plugins/Essentials/userdata/sigurre.yml
	plugins/GriefPreventionData/ClaimData/_nextClaimID
	plugins/GriefPreventionData/PlayerData/BraveNewWorld78
	plugins/GriefPreventionData/PlayerData/Killerbean0
	plugins/GriefPreventionData/PlayerData/PRPLD02
	plugins/GriefPreventionData/PlayerData/PRPLD03
	plugins/GriefPreventionData/PlayerData/Sigurre
	plugins/GriefPreventionData/PlayerData/roboashy
	plugins/PermissionsBukkit/config.yml
	server.properties
	wepif.yml
	white-list.txt
	world/data/Fortress.dat
	world/data/Mineshaft.dat
	world/data/Temple.dat
	world/data/Village.dat
	world/data/idcounts.dat
	world/data/villages.dat
	world/level.dat
	world/level.dat_old
	world/players/BraveNewWorld78.dat
	world/players/Killerbean0.dat
	world/players/PRPLD01.dat
	world/players/PRPLD02.dat
	world/players/PRPLD03.dat
	world/players/PRPLD04.dat
	world/players/PRPLD05.dat
	world/players/PRPLD06.dat
	world/players/PRPLD07.dat
	world/players/PRPLD08.dat
	world/players/PRPLD09.dat
	world/players/PRPLD10.dat
	world/players/PRPLD11.dat
	world/players/PRPLD13.dat
	world/players/PRPLD14.dat
	world/players/PRPLD15.dat
	world/players/PRPLD16.dat
	world/players/PRPLD17.dat
	world/players/PRPLD18.dat
	world/players/Sigurre.dat
	world/players/Zachasaurs97.dat
	world/players/roboashy.dat
	world/players/trainfrog.dat
	world/region/r.-1.-1.mca
	world/region/r.-1.-2.mca
	world/region/r.-1.-3.mca
	world/region/r.-1.0.mca
	world/region/r.-1.1.mca
	world/region/r.-2.-1.mca
	world/region/r.-2.-2.mca
	world/region/r.-2.-3.mca
	world/region/r.0.-1.mca
	world/region/r.0.0.mca
	world/region/r.0.1.mca
	world/region/r.1.-1.mca
	world/region/r.1.0.mca
	world/region/r.1.1.mca
	world/session.lock
	world_nether/DIM-1/region/r.-1.-1.mca
	world_nether/DIM-1/region/r.-1.0.mca
	world_nether/DIM-1/region/r.0.-1.mca
	world_nether/DIM-1/region/r.0.0.mca
	world_nether/level.dat
	world_nether/level.dat_old
	world_nether/session.lock
	world_the_end/DIM1/region/r.-1.-1.mca
	world_the_end/DIM1/region/r.-1.0.mca
	world_the_end/DIM1/region/r.0.-1.mca
	world_the_end/DIM1/region/r.0.0.mca
	world_the_end/level.dat
	world_the_end/level.dat_old
	world_the_end/session.lock