duck swim
Merge branch 'master' of https://github.com/fafih/canard

Conflicts:
	canard.rb