Webservice
Merge branch 'master' of https://github.com/zehnp1/DiabetesBuddy