do coffeescript
migrate to haml
merging
merge