added all stuff from gh-pages to master