Merge branch 'gh-pages'

Conflicts:
index.html
Fixed conflict
Merge branch 'master' of https://github.com/fdefitte/mojito