WIP
Merge branch 'master' into resize
WIP tests are green though so far
WIP
fix merge conflicts with master
resizes elements across entire site to look better
fixes merge conflict with master
Merge pull request #43 from coreyd303/resize

Resize