First pages commit
merging master and gh-pages