Restored README.md
Minor changes to README.md
Merge branch 'master' into ZhuangLab-master
Fixed minor bug in CreateDefaultParameters
Merge branch 'master' of https://github.com/ZhuangLab/matlab-storm
Added flag to .gitattributes to handle README conflict
Restored correct README.md
Revert "Fixed minor bug in CreateDefaultParameters"

This reverts commit a920e289e61a2c153d5b3db68154a4fca6c330aa.
Revert "Restored correct README.md"

This reverts commit e767d7d205acecc059febb50aebe3d25596bb263.
Merge branch 'Jeff' into ZhuangLab-master
Addressed minor bug in CreateDefaultParameters
Handled README.md conflict