inital commit
Merge github.com:TheHeatcliff/Android