some comments added
added author name as comment
Merge branch 'testing'
conflict line added
conflict line added
Merge branch 'conflict'

Conflicts:
	helloWorld.c