Completion of search
Merge branch 'updating-users'

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/models/user.rb
	app/views/layouts/_header.html.erb
Refinements to custom css
Some code refinements