fb key
mid devise process

created user model, route devise path, added fb id secrets,yml, added initializer
finish devise setup

created omniauth callbacks controller, updated user model, added fb conditional to layouts, added key and id to initializer, modified devise in routes, rm id's from secrets.yml
fb sign in works

added name column
Merge branch 'login' into develop
Merge branch 'master' of github.com:Oneill38/drinkr into develop
Merge branch 'develop'
fixed merge conflicts
Facebook login, plus profle page with infooo
search items
fixed conflict in welcome index
deleted gem file.lock and bundled to fix dependency issue
Merge branch 'develop' of github.com:Oneill38/drinkr into develop
travis.yml file
testing env
Merge branch 'develop' of github.com:Oneill38/drinkr into develop
Merge branch 'develop' of github.com:Oneill38/drinkr into develop
capybara landing testing
landing see categories & subcategories