done
Merge branch 'filling-in-layout'

Conflicts:
	app/views/users/new.html.erb
Merge branch 'filling-in-layout'