updated style of some pages
fixed merge conflict
Merge branch 'master' of https://github.com/emilyreinhold/StatThat