Finish layout and routes
Make a basic User model with secure passwords
Merge branch 'modeling-users'

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/_header.html.erb
	spec/requests/static_pages_spec.rb
	spec/support/utilities.rb