Merge pull request #2 from StevenEBarbaro/master

upstream get
Added gitattributes file to normalize line endings.
Merge branch 'master' of github.com:StevenEBarbaro/faire into StevenEBarbaro-master

Conflicts:
	index.js
Merge branch 'master' of github.com:StevenEBarbaro/faire into StevenEBarbaro-master

Conflicts:
	index.js
Merge pull request #2 from cbebry/master

.gitattributes