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

Conflicts:
	this is some code.txt
Merge commit 'bf46479d29b38245e6b4a655ff2397cc26085b0d'
Merge branch 'development'