Merged Testing.

Conflicts:
	ps2.c
	sound.c
	sound.h