2nd edit
Merge branch 'master' of github.com:clargod/yo