this is commited from the branch dev
test
erer
13
this is checkouted in dev branch
this is a dev commit
Merge branch 'dev'

Conflicts:
	readme.txt
this is a name that shoule be commited
ok
Merge branch 'feature'

Conflicts:
	readme.txt