changing the baseurl in master branch
fixing the double forward slash issue
Merge branch 'master' into gh-pages