added subscriptions
took off vimeo id in manage subscriptions
added manage subscription vimeo link
added vimeo link
css subscription view page
Merge pull request #20 from crystalperreira/kathy

Kathy
Merge pull request #21 from crystalperreira/Kamilah

Kamilah
Remove @tweet iteration
Fixed merge conflict
Fix merge conflicts
Merge pull request #22 from crystalperreira/fixfeed

Fixfeed
twitter subscribe button bug fix
fixed image tags
fixed intro page
added favicon link
fix rspec
design subscriptions page
Remove sub bios
Finish subscriptions page design
Merge branch 'master' into subscriptions-design