add index and show views
resolve merge conflict
resolve second merge conflict
fix merge conflicts, update routes
update application helper
testing for user_create method in user model