Create README.md
fix conflicts
test of commit
Merge pull request #3 from siggia/master

sync up everybody