change term.hashtag
Merge branch 'master' of https://github.com/purple-martins-2013/Sports-Spike
Merge branch 'master' of heroku.com:sportspike
merging github and heroku masters