From Work
Merge github.com:kspector/sample_app into filling-in-layout
Added links
Finish layout and routes