adding haml gem
Converting html views to haml
fixing conflicts