This is cool.
I am learning Git!
I am done.
Merge branch 'master' into 101701012

Conflicts:
	introduction.txt
Merge branch '101701012'

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

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