Marmots?
Merge branch 'master' of https://github.com/scelmendorf/gittest

Conflicts:
	CM_test/gitTesting_CM.txt
Merge branch 'master' of https://github.com/scelmendorf/gittest