spacing adjustments
Merge branch 'master' into huy
added footer, media, css
fixed merge conflicts