kkk
Merge branch 'master' into new

Conflicts:
	SugaQuest/src/main/java/com/sugacraft/sugaquest/JoinListener.java
	SugaQuest/src/main/resources/config.yml