Merge branch 'master' of C:\Users\Alex\Development\Java\Projects\Minecraft-Demigods with conflicts.
Playing with the Conversation API.
Merge remote-tracking branch 'origin/conversation' into conversation