Added jasmine-rails
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll
WIP on trend feature test
resolved merge conflict
Feature test set up in progress
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll
Merge pull request #22 from danielleadams/js_enhancements

Js enhancements
Rspec WIP
Resolve merge conflict on app/views/map/index.html.erb
Merge pull request #23 from newrube7/ruben/jasmine

Ruben/jasmine
fix tweet factory syntax / usage
fix trend factory syntax / usage
Merge pull request #24 from danielleadams/js_enhancements

Js enhancements
Add tweetstream gem
adds feature test for homepage / trend list
adds framework for map page feature tests
adds feature test for map page
adds framework for trends controller spec
adds trends index controller test
Set up daemon to create tweets based on twitter stream