changes and blog
fixed merge conflict
Merge branch 'ninaalcaras-gh-pages' into lukas