prep to merge
got Jeff's CSS stuff working