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

Conflicts:
	Organizat3/pubspec.lock
	Organizat3/pubspec.yaml
	Organizat3/web/.DS_Store
	Organizat3/web/Asignaturas/.DS_Store
	Organizat3/web/Principal/.DS_Store
	Organizat3/web/Registro/.DS_Store
	Organizat3/web/about/.DS_Store
Merge branch 'master' of https://github.com/Organizat3/Organizat3