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