rails app
creating twitter stream  branch
stream working
merge
merge conflicts
Merge branch 'dev' into twitter-stream
setup controler test file; create questions.md
merge
Merge branch 'twitter-stream' into dev
sidekicked