Merge branch 'updates'
style links in footer 3 to be white
Merge branch 'master' into updates