first commit
second commit
third commit
subvision index commit
Merge branch 'function_A' into develop
changed line 2
Merge remote-tracking branch 'origin/develop'

Conflicts:
	index.php
write for fun nothing  inportant
Merge branch 'jltest'
ignore