frontend change
more frontedn
Merge branch 'master' of https://github.com/miechuliv/git_test
merged?
some frontend changes
hotfix
Merge branch 'frontend'
dsfds
aaaaa
Merge branch 'frontend'

Conflicts:
	file1.php
file5
dev2 ku
fix
file4
all