changed compile settings
precompile settings
merge conflict correction may need more correction
add Google-api-client gem
Merge branch 'development' of https://github.com/SamSamskies/wezolo into development
first attempt at using blogger api to pull posts
adding a tumblr blog creates posts for content
resolve merge conflict with bundle
Fix merge conflict in Gemfile and user show page
Modify country CSV to only include Peace Corps countries.
Fix and add tumblr as Auth Provider and Blog Host in seed.
User can disconnect Tumblr blog
Can now save tumblr photo and text posts.
Took out unnecesary new lines in build_body_photo
mark a message controller test as pending
user can now connect their blogger account, those blogger posts are saved and able to be viewed when you follow that user w/ @stephenitis
fixed merge conflicts Note:blog controller create should be refactored into tumblr and blogger controllers
fixed merge conflicts