adding .settings to gitignore
Merge branch 'develop' of https://github.com/darienalvarez/Chova into develop