Replace haml with html
WIP: rebuilding with TDD