User auth
oops
Merge branch 'master' of github.com:pantry-pal/pantry-pal-api