adding files
Resolving conflicts
Merge branch 'master' of https://github.com/carneymo/learncraft

Conflicts:
	commands/CommandReady.java
	common/Common.java
	common/ConnectionHandler.java
	common/EventHookContainerClass.java