this and that
Merge branch 'master' of https://github.com/avalax/FitBuddyQr