- Changed footer
- Changed links css
merge conflicts