working on profie page
working on image manipulation
merge conflicts fixed