Removed random git lines
Added code to make sure they use the correct amount of args
Merge branch 'master' of https://github.com/InfernoGames/Minecraft-Brawl

Conflicts:
	src/main/java/org/infernogames/mb/MBPlugin.java