bundle installed
Merge branch 'master' of https://github.com/epicodus/chicktech into user_auth
testing, build-out, and basic style for user auth
resolve merge conflicts