Merge branch 'master' into John
index.html fix to footer appearance

avoided part of the icomoon padding issue in the footer by adding a
margin to style in the p tag for the site icons
Merge branch 'John'