module 3 class 1
Merge branch 'master' of https://github.com/Area51TrainingCenter/android_Group07