first commit
Merge branch 'master' of https://github.com/baja24/android
second try