Trying to get Travis to build correctly
Merge branch 'master' of github.com:kclowes/drank_app