new smoke
xyz

Conflicts:
	WordFlash/Classes/Model/WFWordController.m
wwww