Add .idea folder to gitignore
Remove .idea folder
Fuck off
Merge commit 'bcc5fe89a70a715a0381ff261f22f228827fce68' into dirk

Conflicts:
	.idea/workspace.xml
Merge branch 'master' into dirk

Conflicts:
	.gitignore
	.idea/workspace.xml
Merge pull request #7 from Wuisch/dirk

Dirk