changed <segundo_parcial>
Merge branch 'master' of https://github.com/manutero/japanese-3course

merge
gitignore: DS_Store files
odt files
Merge branch 'master' of https://github.com/manutero/japanese-3course

merge