update .gitignore
Merge branch 'feature/Kevin' into feature/Daniel

Conflicts:
	.gitignore