[feature-25] added commit from web
added first line
adding 1st line
Merge branch 'feature-25-update-readme' of https://github.com/githubteacher/first-repository into feature-25-update-readme

Conflicts:
	first.txt
remove first.txt file
[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
added the last line
Merge pull request #1 from githubteacher/feature-25-update-readme

Feature 25 update readme