Merge branch 'gh-pages'
Added links in the footer
Merge branch 'master' into gh-pages