corrige bug
fix conflict in pull
add css
add html markup