generate subscription model, add has and belongs to many users
add has and belongs to many subscriptions to users
add join table migration for subscriptions and users
button/form to create new subscription
find or create method for subscription user relationship in subscription controller
updated find or create to not make duplicate relationships, tweets display on feed
schema
Merge branch 'add-twitter-subscription' of https://github.com/ricarora/SeeMore-Indigo into add-twitter-subscription
feed doesn't load unless logged in, user can't add multiple subscriptions to the same twitter user
fill tweet array with twitter objects in feed
added twitter icon and more tweet info to feed
update load feed to fill an array with hashes of feed items, add add_tweets_to_feed method
update view to use @feed array
sort feed by item[:created_at]
fixed merge conflict
Merge branch 'master' into add-twitter-subscription
Merge pull request #13 from ricarora/add-twitter-subscription

Add twitter subscription