Finished layout and routes
Merge branch 'master' of https://github.com/sharma1nitish/sample_app

What