Data file changed
New feature developped
Merge branch 'master' of https://github.com/ayurinsky/test

Conflicts:
	data.file
Hot fix added.
Merge branch 'newFeature'

Conflicts:
	data.file