featureC is ready!
Merge branch 'featureC'

Conflicts:
	make
	obj1