Merge branches 'filling-in-layout' and 'modelling-users'

Conflicts:
	.idea/sample_app.iml
	Gemfile
	Gemfile.lock