Half-baked multi paragraph and highlighting
Merge branch 'master' of https://github.com/StanfordHCI/story-collab

Conflicts:
	app/views/stories/_form.html.erb
	app/views/stories/show.html.erb
	config/routes.rb