Added rest of content
Merge branch 'master' into feature-fixed-footer