vfu
Merge branch 'master' of https://github.com/sbaixas/Proyecto-PA

Conflicts:
	src/ProyectoPA/Manager.cs
Merge branch 'master' of https://github.com/sbaixas/Proyecto-PA
Merge branch 'master' of https://github.com/sbaixas/Proyecto-PA
by mati
Merge branch 'master' of https://github.com/sbaixas/Proyecto-PA

Conflicts:
	src/ProyectoPA/consoleMng.cs
Merge branch 'master' of https://github.com/sbaixas/Proyecto-PA