Change baseurl
Change URL
Fix merge conflict
Udpate data
Update _config.yml
Merge pull request #2 from aigarsdz/gh-pages

Merge the author's update