fix merge issue
Merge branch 'master' of github.com:camirmas/hash-clinic