first commit
Merge branch 'master' of https://github.com/colossus689/Test

Conflicts:
	main.c