Merge branch 'Mike---Branch' into Br_Manny and minor formatting
Added ability to run conversation files and record output. Minor cleaning and refactoring
Merge remote-tracking branch 'origin/Mike---Branch' into Br_Manny

Conflicts:
	ChatBot/src/DictionaryMap.java
	ChatBot/src/Program.java
	ChatBot/src/ResponseMaker.java
	ChatBot/src/Responses.java
Merge remote-tracking branch 'origin/Br_Manny'

Conflicts:
	ChatBot/src/ParsedInputType.java
	ChatBot/src/ResponseMaker.java
	ChatBot/src/Responses.java
	ChatBot/src/TravelAgent.java
Merge branch 'master' of https://github.com/allantsai123/COSC310project

Conflicts:
	ChatBot/src/ParserDictionary.java
	ChatBot/src/TravelAgent.java