Added update, privacy, and edit to habit show page
fixed merge conflict
Merge branch 'stuartstein-pillspartial'