test comflict
Merge branch 'master' of https://github.com/jcsbmwxyha/CProject

Conflicts:
	main.c
	math.c