crash and burn
adding gitattributes
Merge branch 'master' of https://github.com/BrendanPluralsight/psychic-ninja

Conflicts:
	README.md