credit
conflict

Merge branch 'gh-pages' of github.com:dingledow/designerchat into gh-pages

Conflicts:
	assets/css/min-style.css