fixed tests
add additional css
merge conflict
messed with tests
cssing home page
merge conflict