first commit on github
added android code
README conflict fixed