version 3.7
Merge branch 'master' of https://github.com/CapstoneCreations/irc

Conflicts:
	CHANGES.html
	CHANGES.md
	config.codekit
	css/main.css
	style.css