added js
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
updated 'my profile' link
removed cancan & modified controlers using cancan methods
added gem omniauth-google-oauth2
updated subscribe/unsubscribe method in JS
updated subscribe/unsubscribe method to also handle subscriber count and pluralization
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
start updating user model
successfully attempt authentication & start work on callback
updated gem file, and both feeds and articles models and views for article and image scraping
added archive/unarchive and bookmark/unbookmark functions on article show page
correcting mistake from branch feature/install_readability_gem
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
fixed missing translation error on devise
finished google oauth configuration
updated gemlock
ignore
added 'show_on_profile' field to manage subscription visibility
updated subscribe/unsubscribe method to handle option for user to set subscribed feed as public (visible on profile) or private