ignore plz
Merge remote-tracking branch 'origin/Kasper' into Kasper

Conflicts:
	.gitignore