..fixed some tagging issues
router.js modified
added preliminary tests

Conflicts:
	server/js/routes/routes.js
added first test
added user and data tests