Merged Testing.

Conflicts:
	ps2.c
	sound.c
	sound.h
Merge branch 'master' into testing

Conflicts:
	ps2.c
	ps2.h