TDD + changed \'user\' references to \'drink\' references in api routes
server.js, api_test.js, drinkRoutes.js conflicts resolved
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp