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

Conflicts:
	index.php