add Kapella.iml to git ignore
Merge branch 'master' of https://github.com/BlueprintHTHS/Kapella

Conflicts:
	.gitignore