AreGood
Merge branch 'NewerBranch'

Conflicts:
	Example.txt.txt