Change readme
add name
Resolved conflict
Changed some css