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