subido de vamos
Merge branch 'master' of https://github.com/nikun/kun1