switching to erb
back to erb

Having trouble with haml, going back to erb

Merge branch 'erbs'