Add haml gem and bundle
resolve conflict in gemfile
Merge branch 'darkmoves-add-haml-gem'