Added .gitignore for android files
Merge remote-tracking branch 'origin/master'