Added user_stories to this branch
Merge branch 'thor-branch' of github.com:thortek/dgm4790-spring2014 into thor-branch