switching branches to work and merge
fixed styling on followers/following
merge conflict fixed
Merge branch 'master' into image_profile
Merge branch 'master' of https://github.com/wahl77/WDI_FinalProject into image_profile
fixed styling errors
got rid of scolling div area
Merge branch 'master' of https://github.com/wahl77/WDI_FinalProject
Merge branch 'master' into image_profile