add .settings/
Merge branch 'master' of https://github.com/eballo/catalunya-medieval-test-suite

Conflicts:
	.gitignore