add Eclipse/Geppetto .project file to .gitignore
Merge branch 'master' of git@github.com:Aethylred/puppet-blank.git

Conflicts:
	.gitignore