feature 1
feature 2
Merge branch 'master' of https://github.com/ikhvorost/test into features

Conflicts:
	file2.xml