Merge gh-pages with master

Update the git page with the master branch (primarily add back to current week button)