Added flag to .gitattributes to handle README conflict
Merge branch 'Jeff' into ZhuangLab-master