Merge: 'xylar/cosim2/new-branch' into branch

Useful comment goes here...

* origin/xylar/cosim2/new-branch:
  Added some confusing changes to main_file.txt
  Added new Changelog file

Conflicts:
	Changelog
	main_file.txt
Merge 'douglasjacobsen/cosim2/new-branch' into branch