added start, progress, and end through assignment
fixing merge conflicts

Conflicts:
	client/index.html