fixing conflict in highcharts js and moving it up on the index page
Merge pull request #1 from adairjk/master

fixing conflict in highcharts js and moving it up on the index page