Merge branch 'hotfix' of github.com:Venture-TheSphinxTeam/Sphinx into hotfix
Merge branch 'master' of https://github.com/Venture-TheSphinxTeam/Sphinx
Ricky is dead.

Goodnight sweet prince
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