add .settings to gitignore
Merge branch 'master' of https://github.com/gkorland/cpbm.git

Conflicts:
	.gitignore