commit fail?
Merge branch 'master' of https://github.com/jomscl/CP1-1

Conflicts:
	CP 1/CP 1.v11.suo