Merged ZX-128 stuff

Put the stuff together and fixed line endings.