Agenda 2-10
Merge branch 'master' of https://github.com/CyberdyneSystems2340/AndroidApp into Rob