Installed and added carrierwave gem to gemfile
Installed fog gem
Switched carrierwave storage to fog and updated gemfile
jk lol not going to use fog yet
Added avatar column to users
Avatar now json not working yet though
More work on uploading and displaying new profile pics, doesn't work yet
Yahoo! Updating profile images works
Fixed merge conflict
Merge branch 'Brianne2'
updated controller logic and view logic to block users from seeing things they shouldn't