Merge pull request #58 from Venture-TheSphinxTeam/dev

Dev
Merge pull request #60 from Venture-TheSphinxTeam/dev

Dev
Update README.md
Going to new subscription branch for Yingling
Readme sillyness
Merge pull request #62 from ShadowSam/master

initial push
I'm cooler than a cucumber
Fixed bugs associated with User class
Merge remote-tracking branch 'upstream/subscriptions'
Merge pull request #64 from ShadowSam/master

Still untested but now compiling... necessary for teamwork. Do not pull unless working with subscription database infastructure change
Fixes
Merge branch 'subscriptions' of https://github.com/Venture-TheSphinxTeam/Sphinx into subscriptions
Update install.sh
Close to working except, based on output, it is still pol pointing at the dev database. This is in the process of being tracked down. Also inally replaced all hardcoded database calls and username insertions
Merge pull request #65 from ShadowSam/master

Close to working except, based on output, it is still pol pointing at th...
replaced all arbitrary references to ports and urls with constants
Merge remote-tracking branch 'upstream/subscriptions'
Again I forgot that the Jongo mapper can't use non-empty constructors.
Fixing the tab issues on the subscriptions page.
div pls