made jason's edit
Merge branch 'jason's-footer-edit'