whitespace
fixed conflicts

Conflicts:
	kwilt/kwilt.pde