css for the front page
merge conflict