Update 9.29
Merge branch 'master' of https://github.com/wpagee/spotChat

Conflicts:
	css/site.css