lmy test commit
Merge branch 'master' of https://github.com/cshunk/gitflowtest

Conflicts:
	test.txt