Finish layout and routes
Merge branch 'master' of github.com:YadiraElizabeth/sample_app