Fran
Merge branch 'master' of https://github.com/Organizat3/Organizat3

Conflicts:
	organizate/web/pages/asignaturas.html