Merge gh-pages to local master branch 

I think this should solve my problem.