made a change
haha
Merge branch 'ping'

Conflicts:
	file1.txt