Change the footer to link to the main web site
Merge remote-tracking branch 'origin/master'