Half way through C5
Finish layout and routes
Going back to previous commit
Merge branch 'master' of https://github.com/lb0202/sample_app