maybe rspec broken
ok
Merge branch 'filling-in-layout'