Added a line in a branch

Test branch
test.c

Added test.c file
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.txt