dumb branch
Merge branch 'master' of github.com:Holong/test

Conflicts:
	main.c