What
Merge branch 'filling_in_layout' into modeling-users

Conflicts:
	config/routes.rb
Basic model