updated columns and text on about.html
fixed merge