configure gitignore
Merge branch 'master' of https://github.com/nelvido/nelvido-ci.git

Conflicts:
	.gitignore