updated .gitignore
Merge branch 'master' of https://github.com/beinformed/lab-dialogprogress

Conflicts:
	.gitignore