added git attribute
added git attribute
Merge branch 'master' into gh-pages
add resources