making this fucker pretty and committing everything in one go - 'cos I'm a badass
resolving merge conflicts
resolving more merge conflicts
adding some box shadow
Merge branch 'make-me-pretty'
remove footer padding, so there is no horizontal scrolling
Merge branch 'make-me-pretty'
gen css
editing footer links
Merge pull request #1 from markconroy/master

Made it Prettier