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
Rspec WIP
Resolve merge conflict on app/views/map/index.html.erb
Merge pull request #23 from newrube7/ruben/jasmine

Ruben/jasmine
create get_past_trends method in trend model
make get_past_trends method one line
remove argument from get_past_trends method
account for duplicate trends in recent trends view
add view all trends list that shows and hides all trends
Merge pull request #24 from danielleadams/js_enhancements

Js enhancements
Merge with most recent code
Add code for script to run daemon that automatically saves tweets from current trends when they have a geolocation tag