added .properties to .gitignore
Merge branch 'master' of https://github.com/Zazcallabah/id2216