Merge branch 'master' of https://github.com/bchiatt/i-fit into matt
Merge branch 'master' of https://github.com/bchiatt/i-fit into matt
working
working
Merge pull request #26 from bchiatt/matt

Matt