all commit:
Merge branch 'master' of https://github.com/klash75/website
Merge branch 'master' into gh-pages