add gitignore
Merge branch 'test' into feature/test2

Conflicts:
	.gitignore