This is the commit has half of what we want.
Merge branch 'conflict_testing' into development

Conflicts:
	this is a test doc.txt