Tabular format for easier reading
Fixing etherpad-lite
Fixing formating for bullet
First conflict of my life