Merging master and gh-pages branche

because I don't know how to git. Basically.