Chads organized user stories
Merge branch 'chad-branch' of https://github.com/thortek/dgm4790-spring2014 into chad-branch