untrack
Merge branch 'filling-in-layout' of https://github.com/momenian/sample_app into filling-in-layout
footer