update .gitignore
Merge branch 'master' of https://github.com/juehv/DentalImageViewer

Conflicts:
	.gitignore
sync