bugFix
fdsfa
Merge branch 'bugFix'

Conflicts:
	test.c