More eclipse ignores
Merge branch 'master' of https://github.com/gierlachg/codebook.git

Conflicts:
	.gitignore