basic css complete
added screenshot
fixed merge conflicts