cambios finales
Merge branch 'master' of http://github.com/kaoru17th/topclass
Merge branch 'master' of http://github.com/kaoru17th/topclass