--added eclipse files to gitignore
Merge branch 'master' of https://github.com/rtoal/chuzr

Conflicts:
	.gitignore