Update .gitignore
Merge branch 'master' of github.com:ffosilva/collector-service

Conflicts:
	.gitignore