users_controller conflicting change test
Merge branch 'master' of https://github.com/kkarloe/tutorial_sample_app