Merged Testing.

Conflicts:
	main.c
	ps2.c
	ps2.h
	sound.c
	sound.h