Handled readme conflict
Merge branch 'ZhuangLab-master'
Added pause to dave actions
Dave can now add pause actions
Added xml-requested pause to Dave
Handled README conflict
Added .gitattributes to address README conflicts
Merge branch 'master' into ZhuangLab-master