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

Conflicts:
	db/schema.rb
working
Merge branch 'master' of https://github.com/johannesE/storysmoker

Conflicts:
	db/schema.rb