Create relationships between User, Subscription, Feed
Merge branch 'master' into skwak
getting ready to merge
test merger
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
add home controller, auth link
add search vimeo form
add oauth
add bootstrap
fix merge conflicts
add more bootstrap
remove env
add sessions stuff
mege conflicts