add .prefs to gitiignore
Merge branch 'master' of github.com:henkvos/InLOC

Conflicts:
	.settings/org.eclipse.core.resources.prefs