Set .gitignore to ignore .settings which caused problems for Brandons build
Merge branch 'master' of https://github.com/colinkho/realtalk