Changed output
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/grinnell/csc207/goldstei1/hello/HelloGit.java