Merge branch 'master' into social-links-at-the-bottom-of-contact-section

Conflicts:
main.css