fuck you were added
Merge branch 'master' of https://github.com/petchds/test

Conflicts:
	Hello.txt