Merge pull request #68 from 121watts/user-edit

User edit
Merge branch 'master' of github.com:121watts/the_pivot into user-edit