initial commit with starter android project
fixing merge conflicts