Create relationships between User, Subscription, Feed
Add association to oauth.
Merge branch 'master' into skwak
getting ready to merge
Merge pull request #1 from piinthecloud/mix

Add association to oauth.
Merge pull request #2 from piinthecloud/steph

test merger
Merge branch 'master' of https://github.com/piinthecloud/SeeMore-Aquamarine
add github and twitter keys, add HTTPart gem, add .env to gitignore