yeah testing
Squashed 'testSubtree/' content from commit c6e05d0

git-subtree-dir: testSubtree
git-subtree-split: c6e05d0dbcd95e239da51ba7739ebd5339f02261
Merge commit '6bcb0d7da9e4a6f20ae810903b31603432caad76' as 'testSubtree'
Testing more
Merge commit 'e3e176caa665532a8f27ab0db26040a8922fb75a'

Conflicts:
	testSubtree/testing