updating notes on work done
Work Summary update
Corrected user routes
Merge remote-tracking branch 'origin/janice' into janice

Conflicts:
	config/routes.rb