removed unused variables and corrected the macro error
conflict resolved
Merge branch 'master' of github.com:telnet2/gradworks

Conflicts:
	itkProjects/ktools/piImageDef.h