michael's changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	data.txt
	hello.txt