pierwszy commit
better second commit
remove file
changed name
add 2 and 3
add test
add test
add test2
add fix
Merge branch 'task#1'
add task2
Merge branch 'task#2'
merge
add test
add test
Merge branch 'testing'

Conflicts:
	test.php
php4
php4
php4
php4