idea project for android app
gitignore update
merge