updated profile
fixed merge conflicts in in users/show
Merge branch 'master' of https://github.com/walterlatimer/goodmeasure