Conflicts anyone?
Conflict resolution?

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

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