User story done
Merge branch 'user_story'
Merge branch 'master' of github.com:arramos84/cs169-group25