working on making android more user friendly
Merge branch 'master' of github.com:elenavillamil/CollaborativeProject