changes and blog
fixed merge conflict
Merge pull request #148 from ninaalcaras/gh-pages

changes and blog