ignore settings
ignore .settings
Merge branch 'master' of https://github.com/heroinedor/android