second commit

Conflicts:
	computing_center.c