remove .settings
new gitignore with .settings
Merge branch 'master' of https://github.com/optimad/PABLO.git

Conflicts:
	.settings/language.settings.xml