Finish layout and routes
Merge branch 'master' of https://github.com/Kemezie/sample_app
Finish layot and routes (Update)