Old Version of chart
Merge remote-tracking branch 'origin/master'

Conflicts:
	about.html
	chat.html
	css/styles.css
	js/chatlist.js