insert user into global scale fix
merge conflict fix
merge conflict fixed
Merge branch 'master' of github.com:GuardianInteractive/weight-watch
fix so fatties who get called fatties don't feel so bad