conflict resolve 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Git_test/main.c

	+tag 1