change term.hashtag
fixed bug on voltmeter if value is less than zero
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
sms should have game status
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
Merge pull request #26 from purple-martins-2013/show-game-status-in-sms

sms should have game status
game status should be a thing
Merge branch 'master' of https://github.com/purple-martins-2013/Sports-Spike into show-game-status-in-sms
Checking for merge conflicts
update schema
Merge pull request #29 from purple-martins-2013/fix-spike-game-status

Fix spike game status
Merge branch 'master' of github.com:purple-martins-2013/Sports-Spike
Merge branch 'master' into foundation