change
modified readme.txt
Merge branch 'feature2'

Conflicts:
	readme.txt --made a union of both merges
 delete all
modified readme.txt
modification 1 on feature1
modification 2 on feature1
readme modifictions
modification1
modification2
merged
mod1
mod2
cucu
ducu
Merge pull request #1 from vlddamian3/feature1

Feature1