committed hex svg, main css
fixed merge conflict