Added erb to stories
removed line from api file that was throwing error
fixed merge conflicts
Merge branch 'master' into stories
Getting branch up-to-date
Merge branch 'master' of https://github.com/alvarezmelissa87/rails-tweetlibs
updating local master
Merge branch 'master' into stories
Making sure branch is up-to-date
Able to grab selected tweets. Working on putting them in the story
Got tweets and able to show story. working on putting in tweets in story
Merge pull request #14 from alvarezmelissa87/stories

Stories