print "hello world"
modified introduction.txt
Merge remote-tracking branch 'origin/102701014'

Conflicts:
	introduction.txt
Merge branch 'master' of https://github.com/nccumath/git-exercise-1

Conflicts:
	introduction.txt