:confetti_ball: Added .gitattributes
Merge branch 'master' of https://github.com/giacomocusinato/octopress

Conflicts:
	.gitattributes