Switch docs to gh-pages branch
moving docs back to master
Making readthedocs work
Merge pull request #43 from johnb30/master

Working on docs