makin conflicts
Merge branch 'development' of https://github.com/jmagic/testing into development

Conflicts:
	this is a test doc.txt