named wrong
added user controller and layout link test
merging branch filing-in-layout to master

Forgot to merge branch filling-in-layout