highcharts displays data retreived by model through rails controller
fixed merge conflict on app.js in locations, form toggle
removed debugger
Merge branch 'master' into locations2
working on rendering all locations on homepage map