Git Attributes, with control for line-endings
Fixed typo
Merge commit 'd0e7b628b757e23e5618ef97e8905edb67f0c91b'

Conflicts:
	.gitattributes