Changes to be committed:
	new file:   main.c
made a change
made another change
hot fix
Merge branch 'testing'

Conflicts:
	main.c