added a commit
Merge branch 'development' of https://github.com/jmagic/testing into development

Conflicts:
	this is some code.txt