img added to about page
merge conflicts fixed