doc update
Merge branch 'master' of https://github.com/Pocckey/HashTagYoloSwag

Conflicts:
	COSC310 A2 Documentation.docx
	ChatVader/src/Bot.java
	ChatVader/src/Chat.java