Add timestamps to chat messages (Fixes GH-18)
add 'in reply to' to the discover view
Merge pull request #30 from selenamarie/in-reply-to

add 'in reply to' to the discover view
Add bio to view data (Fixes GH-28)
Merge pull request #31 from remixz/gh-28-fix-bios

Add bio to view data (Fixes GH-28)
Merge pull request #27 from lewiscowper/patch-1

Added background-color to links on hover, fixes #8
Merge pull request #29 from remixz/gh-18-timestamps

Add timestamps to chat messages (Fixes GH-18)
fixed time formatting
allow ops to delete other posts
autolink bio data
fix bio unescape
return proper twilio error during invalid auth
added reply in post view for user
rules update
Merge branch 'master' into emote-implementation

Conflicts:
	public/js/chat.js