new file:   fix
	new file:   bugFix
	new file:   bugFix
Merge branch 'testing' into bugFix

Conflicts:
	bugFix

	modified:   bugFix
Merge branch 'master' into bugFix
Merge branch 'bugFix'