added .idea to .gitignore
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS

Conflicts:
	.gitignore