working updates on receiver; added .settings/ to gitignore
Merge branch 'master' of https://github.com/ShadowSam/WorkoutCompanion