updated main css with wednesday changes

i.e. just merging my and ryan's css from yesterday