initial commit
Merge branch 'master' of https://github.com/ferisjuan/ahorcado

Merge the partsi