wip layout
Merge branch 'master' of github.com:giacomozinetti/haralyzer into gh-pages