Switch to haml

I've finished the switch to haml files, 'rails server' works, but it says I can't merge the branches