add cm2.erl
update the whole repo
Merge branch 'master' of github.com:lexruee/Unifr-Pr4

Conflicts:
	project/teda/apps/CM/cm2.erl