changed user_story -> bug
Merge branch 'master' of https://github.com/foresterh/marvin