added new site directory to gh-pages
updating .gitignore again
Merge branch 'master' into gh-pages