fifth commit
Merge branch 'master' of https://github.com/Mitch18244/myproject

Conflicts:
	hi.txt
	new.txt