Merge branch 'hotfix' of github.com:Venture-TheSphinxTeam/Sphinx into hotfix
Making vote/watch functions
Merge remote-tracking branch 'upstream/dev'
Basic setup for the vote class.  Need to test it to make sure it sends properly
Application configurations referenceing external api we're posting to.
Merge branch 'master' of https://github.com/Venture-TheSphinxTeam/Sphinx
Ricky is dead.

Goodnight sweet prince
Merge remote-tracking branch 'upstream/dev'
Removing project
Merge pull request #49 from ShadowSam/master

Maybe this will fix things... at least it will remove the .project file
Merge pull request #50 from Venture-TheSphinxTeam/dev

Dev
I WILL ADD THE .PROJECT FILE AND .gitignore WILL NOT STOP ME!
Merge remote-tracking branch 'upstream/dev'
In progress
Fixed the problem with subscriptions. String comparisons were set up incorrectly.
Merge pull request #51 from ShadowSam/master

Fixed subscriptions
Functionality for voting (minus the sending of the vote to the PM system) is now completely working
js for keyword search
Merge pull request #52 from ShadowSam/master

Functionality for voting (minus the sending of the vote to the PM system...
Added watching