convert sample to haml and add some stuff
Merge branch 'haml' into gh-pages