CC commit
test
commit
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	shared_counter/main.cc