re-do
Merge branch 'master' of https://github.com/BPHS/ChatBot

Conflicts:
	GeoTyChatBot.java

re-do