Controller specs in progress
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ruben/controller_specs
Controller Specs WIP
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ruben/controller_specs
Trend rspec modification - deleted random trend test
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ruben/controller_specs
Removed trend test
Resolve merge conflict
Merge pull request #63 from newrube7/ruben/controller_specs

Ruben/controller specs
Merge pull request #64 from danielleadams/javascript_refactor

Javascript refactor
pull from upstream
bundle that changes Gemfile.lock