finished about.html page
fixed merge