Added test.c file
Added some more lines
Added 3rd new line
Changed a line
Merge branch 'testbranch'

Conflicts:
	test.c