Updated to Mix project
Merge branch 'master' of github.com:evan108108/Drink-JSON