Merge branch 'develop' of github.com:Oneill38/drinkr into develop
added read me
capybara landing testing
landing see categories & subcategories
Merge branch 'develop' of github.com:Oneill38/drinkr into develop
Merge branch 'master' of github.com:Oneill38/drinkr