arreglando index.php responsivo
arreglando conflictos
Merge branch 'master' of https://github.com/jonajgs/schoolsysWBD