Added latest work.
Merge branch 'master' of https://github.com/AndrewSmart/CS5600

Conflicts:
	ChatBot/ChatBot.csproj
	ChatBot/ChatBot.sln
	ChatBot/ChatBot.userprefs

I think I fixed the problems with this pull.