chat circle
Merge branch 'master' of https://github.com/adamloke/ATLANTA-CLUBS

Conflicts:
	js/main.js