Merge branch 'filling-in-layout' into modeling-users

Conflicts:
	Gemfile.lock
	app/views/users/new.html.erb
	config/routes.rb
Merge branch 'modeling-users'

Conflicts:
	Gemfile.lock
	app/views/users/new.html.erb
	config/routes.rb