#237 Implement static navbar
Fix heading display on conversations#show
Merge pull request #109 from tylerrash/fix-conversation-view-column-heading

Fix heading display on conversations#show
Merge pull request #108 from tylerrash:wip-237

Conflicts:
	app/views/conversations/show.html.erb