new commet to see how it will be merged
commiting after merging with branch v0.2

Conflicts:
	homework1.php
merging v0.2 result