增加代码注释
Merge branch 'master' of https://github.com/kingzeus/Program-O
同步代码
Merge branch 'master' of https://github.com/kingzeus/Program-O

Conflicts:
	chatbot/conversation_start.php