adding 1st line
Merge branch 'feature-25-update-readme' of https://github.com/githubteacher/first-repository into feature-25-update-readme

Conflicts:
	first.txt
[feature-25] adding second line to first
Merge branch 'feature-25-update-readme' of https://github.com/githubteacher/first-repository into feature-25-update-readme

Conflicts:
	first.txt