Added new Changelog file

With my name and date on the first line.
Making a change in main_file

To help realize merge conflicts later on.
Merge 'douglasjacobsen/cosim2/new-branch' into branch

This adds a changelog file, which is amazing, and modifies main_file.txt.

Conflicts:
	Changelog
	main_file.txt