commit 1
Merge branch 'master' of github.com:moritzf/infineonxc2287m

Conflicts:
	.gitignore