android stuff
Merge branch 'master' of https://github.com/worxli/hackzurich14