Working on warp 1 image class first
Merge remote-tracking branch 'origin/master'

Conflicts:
	PSF1/PSF1.sdf
	PSF1/PSF1.v12.suo
	PSF1/PSF1/x64/Debug/PSF1.log
	PSF1/PSF1/x64/Debug/main.obj
	PSF1/PSF1/x64/Debug/utils.obj
	PSF1/x64/Debug/PSF1.exe
	PSF1/x64/Debug/PSF1.ilk
	PSF1/x64/Debug/PSF1.pdb