change from erb to haml
Cleaning up mess
Add user following