empty commit
Merge branch 'master' of github.com:johannesE/storysmoker
unlock_all is working