fix .gitignore for intellij files again
Merge branch 'master' of https://github.com/bridgitt/bridgitt

Conflicts:
	.gitignore