Ignore eclipse turds.
Merge commit '1abb735'

Conflicts:
	.gitignore