added new about page
typos
fixed conflictsg