Redaccion: objetivo
Merge branch 'master' of github.com:manutero/Japanese