List all users
Merge branch 'updating-users'

Conflicts:
	app/views/users/index.html.erb
	spec/requests/user_pages_spec.rb