new readme from source
Merge branch 'master' into gh-pages
Removed semicolons. New readme.
fixed merge conflict