Fixed? Maybe?
Merge branch 'master' of https://github.com/InfernoGames/Minecraft-Brawl

Conflicts:
	src/main/java/org/infernogames/mb/Arena/ArenaSettings.java