Handled README conflict
Added .gitattributes to address README conflicts
Merge branch 'master' into ZhuangLab-master
Merge branch 'master' into development
Handled merge conflict with README