branch test
branch test2
branch test2
aaaa
Merge branch 'function2'
11111 master
22222 function2
Merge branch 'function2'

Coflict fixed

Conflicts:
	worldcup.php