lodi dodi
Merge branch 'master' of https://github.com/DerMinze/AndroidAssignment-1