test 1
test 2
fixed typo
Merge branch 'patch-2'

Conflicts:
	hello.c