routing, helper, and erbs
Merge branch 'master' into user_model_and_login