Added haml gem
Fix conflicts