C
Merge branch 'dingo'

Conflicts:
	README.md