new file:   bugFix
Merge branch 'testing' into bugFix

Conflicts:
	bugFix

	modified:   bugFix