adds a route for watching the workers' progress
resolves conflict and merges
fixes progress checker calculation
ties in the progress data to the ui