currently duplicated image boxes, one for carrierwave and one for oauth
sorted out the images
merging
Merge branch 'master' into develop
started working on following button, now have pink toggling button
you can now follow, but count does not go down for unfollow
solved merge conflict