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
Complete setup of proximity routes.
Complete update function. Add spec file.
Remove bookshelf and knex from package.json.
Add documentation to proximity controller.
Establish working relationship between proximity controller and proximity routes.
Add specs for proximity endpoints. Export server in server.js
Add more tests for proximity controller.
Add primary key to proximity table.
add more tests.
add further testing.
complete tests.