Feature++
Merge branch 'master' of github.com:daboross/minecraft-commandline-interface

Conflicts:
	src/main/java/net/daboross/mccli/Main.java