Conflicts:
	EDCClient/buzzer.c
	EDCClient/lib/libmpedc.a