Merge branch 'master' of https://github.com/ojiman/ccdh

Conflicts:
	.gitignore
added mrunit
added mrunit
Merge branch 'develop_mrunit'