:neckbeard: Added .gitattributes & .gitignore files
test commit. added one file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore