Initial DB setup
Merge branch 'master' into mongoDB
Merge branch 'mongoDB' into pretty
Merge pull request #2 from chushao/pretty

Pretty
Converted password to password + salt
Added a test database
Merge branch 'prettier' into mongoDB
Set up user authentication with database
Grabbing correct Data from database for Workplay, making information dynamic and finsihed seeding database
Changed a math rounding error
Merge pull request #3 from chushao/mongoDB

Mongo db
Updated add activity to working
Updated add activity so date works fine
spelling iz hard
Merge pull request #4 from chushao/mongoDB

Mongo db
cleaned up code
Merge pull request #5 from chushao/mongoDB

cleaned up code
Set up registration
Updated workplay and workplay certain date
Merge pull request #6 from chushao/mongoDB

Mongo db