Fixed routes, added more tests
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
more tests
Fixed routes, added more tests
more tests
minor changes
Merge remote-tracking branch 'origin'

Conflicts:
	server/controllers/userController.js
minor fixes
Merge pull request #115 from suprbh/master

Updated routes, specs for user Controller