Minor CSS changes, made page content narrower
fixed merge conflicts
Merge pull request #152 from sarahelizabeth/master

Minor CSS changes, made page content narrower