c
Merge branch 'master' of https://github.com/johannesE/storysmoker

Conflicts:
	.idea/gitstorysmoker.iml
	.idea/runConfigurations/Development__gitstorysmoker.xml
	.idea/runConfigurations/Production__gitstorysmoker.xml
	.idea/workspace.xml
	app/controllers/stories_controller.rb
	app/views/stories/show.html.erb