test
checking amend2
test1
test3
test4
test 6
Merge branch 'master' of https://github.com/ilanr/test

Conflicts:
	test.c
remote change
local change
Merge branch 'master' into appl
Merge branch 'appl' into test