sp branch
Merge branch 'master' of https://github.com/merictaze/step4
header, footer rearranged for margin