test commit. adding README
oops. pulled new version accidentally worked on cameron's
Merge branch 'master' of https://github.com/jakeZieve/liveabetes-droid into so-ui
updating gitignore for project propertiez
UI change first draft
Merge branch 'so-ui'