main mockup
Merge branch 'master' of https://github.com/sjmhoekstra/AndroidProject