I just have changed a single firle for a reason
More history
Merge branch 'master' of https://github.com/amitev/GitInPractice.git

Conflicts:
	adr.txt