I made an edit! amend
i have no idea how this works
committing local change
Merge branch 'master' of https://github.com/aiyanakoka/helloGithub

Conflicts:
	README.md