Added .settings/ to .gitignore
Merge branch 'master' of https://github.com/simonjrp/ESCAPE