Marc conflict changes
Merge branch 'master' of https://github.com/cdumarcey/repo1

Conflicts:
	ClassA.rtf