Add footer
Resolve merge conflict in views/layouts/application.html.haml