added colophon
Merge branch 'master' into 47-colophon

Conflicts:
	app/components/conversation.jsx
Merge pull request #53 from goinstant/47-colophon

Colophon