working on homeWork
Merge branch 'master' of github.com:beerent/AndroidApp