Adding a note about commit messages.

This note will later be expanded into more information about commit
messages.
Adding an example commit message.

This can help people build a good practice about making commit messages
within the repository.
Adding a second file to the repository.

Here one can see what it looks like when a file is added to a
repository.
Adding file with my name in it.

This is a very useful file.
Merge remote branch 'origin/github-doug-ranken

Conflicts:
	Changelog

Resolved conflict