more docs
Merge branch 'master' into gh-pages
updated docs
updated more docs
merged conflicts
updated docs
merged readme.md
Merge branch 'master' into gh-pages
updated docs
Merge branch 'master' into gh-pages
updated docs