Change database to postgres
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll
adds support for high_charts to layout
adds js high_charts src
adds high_charts sample to css
adds map route
adds map controller
adds index view
add .travis file
Merge pull request #1 from newrube7/ruben/travis

add .travis file
refactors spacing of JS
adds blue / red coloring
Add rspec gem files and folders
Merge with master
Merge pull request #2 from newrube7/ruben/rspec

Ruben/rspec
test with highchart map
Merge pull request #4 from masidonion/map_display

Map display
Merge pull request #3 from masidonion/alchemy

Alchemy
Delete alchemy_helper.rb
remove extra javascript functions