made some changes to website

Setting a point where the website will be different from the master
branch.
Merge remote-tracking branch 'origin/master' into gh-pages