merging
Merge branch 'working' of https://github.com/mattsexton/healthapp into working