Initial setup
Merge branch 'master' of https://github.com/koen01/android