Merge branch 'master' of https://github.com/liszt26/rails_cookbook
add users