markdown support
Merge branch 'master' into feat/markdown-view

Conflicts:
	app/views/histories/show.html.erb
Merge branch 'feat/markdown-view'