local changes
Merge branch 'feature-25-update-readme' of https://github.com/abiloukha/first-repository into feature-25-update-readme

Conflicts:
	first.txt
adding the file again
readding the deleted remotely file