some diff
Merge branch 'feature-25-update-readme' of https://github.com/btpang/first-repository into feature-25-update-readme

Conflicts:
	first.txt

resolve conflicts
delte merge