cleanup .gitignore
Merge branch 'master' into cleanupGitignore

Conflicts:
	.gitignore
Merge pull request #33 from SimonWaldherr/cleanupGitignore

cleanup .gitignore