iniaial commit
Merge https://github.com/mskimm/android