Revert "try"

This reverts commit 2ee2e057753607d1c5176be50a859bb9c75f7a19.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitattributesqweqweqe