Almost done
Merge branch 'master' of github.com:lorderic/android-training-project-4