updated from master
pulled master
conflict fix
fixed tests
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp