More documentation
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/chatbot/model/Chatbot.java