started solo
completed merge
did some css
merged with Savannah's css changes