Started working on 'about' page
merge