/nlookup gui
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/net/mcmortals/mcmbungee/Commands/NewLookupCommand.java
/s command added