erb to haml
Merge branch 'layout'