Merge branch 'master' of github.com:Oneill38/drinkr into develop
Merge branch 'develop' of github.com:Oneill38/drinkr into develop
wrote a few more sign in sign up tests in login_spec
resolved conflicts
got all tests to pass, 79.31% coverage