Chatlog stuff
Merge branch 'master' of https://github.com/davidjns/493-Group-Project

Conflicts:
	connectfour/chatlog.cpp
	connectfour/chatlog.h