user register
Merge branch 'login'
change erb to haml