Merge pull request #1 from mvayngrib/master

update from Mark's reorg
Update README.md
Update README.md
merged readme
Merge remote-tracking branch 'upstream/master'