added 'about' section
merge conflicts