fixing conflicts
updates du footer
Merge pull request #18 from ljdegastines/layout_and_views_setup

Layout and views setup