Added a comment to the top of the file.
Added a masterful comment.
Merge branch 'mergecheck'

Had to figure out that kdiff3 is unable to output the merged file into a different name. It will store changes in the *REMOTE* file. You have to overwrite/stage this file. Then run "git commit" without options to get this window with baked-in text.

Conflicts:
	chapter-3/listing-3.1.R