Iniciando namaka
Merge branch 'master' of github.com:nun3z/namaka