cleaned up and made minor design changes
Merge branch 'master' of https://github.com/rgabrielsson/MobileMindfulness