5.6 Exercise # 3
Finished 5.6 Exercise #3
Merge branch 'users-controller'