made changes
asda
Merge remote-tracking branch 'Standort38/master'

Conflicts:
	.gitignore