-Added footer model
-Merged conflicted file