added grunt watch
bunch of stuff
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp