Merge branch 'master' of https://github.com/Bocktrow/McMBungee

Conflicts:
	src/bungee.yml
	src/net/mcmortals/mcmbungee/Commands/NewLookupCommand.java
	src/net/mcmortals/mcmbungee/main.java