Merge branch 'content' of https://github.com/nathanhood/web into design
merging content into design branch
more css things
omg
even more css, surprise surprise
design merge resolutions