development db
lock files excluded
Merge branch 'master' of github.com:johannesE/storysmoker
user model added
there were missing files to be committed