stupid coverage resultset file has been modifide
fixed merge conflict
added carrierwave gem
carrier_wave working for remote images
now able to display user avatar photo in top nav bar
started work on form for manaual photo upload
user photo upload works on edit form partial for non-social media users
removing deleted file
removed a p test
Merge pull request #45 from kunovsky/facebook_integration_tests

Facebook integration tests & working carrier wave for photo uploading