Mark user feature continued
Merge branch 'feature/mark-user'

Conflicts:
	app/controllers/members_controller.rb
	app/views/members/index.html.slim