change term.hashtag
Merge branch 'master' of https://github.com/purple-martins-2013/Sports-Spike
fixed error in wrapping fan_pulse_team data in json
Merge branch 'master' of heroku.com:sportspike
merging github and heroku masters
including re-draw logic
redraw function is working correctly
fixed initial loading of voltmeter
re-added mistaken delete
remove errorneous brackets from data series
Merge pull request #27 from purple-martins-2013/voltmeter_redraw

Voltmeter redraw
resolve merge conflicts