sub
Merge branch 'master' of https://github.com/ral249/Series

Conflicts:
	src/aplicacion/mainAdmin.java
Merge branch 'master' of https://github.com/ral249/Series
Merge branch 'master' of https://github.com/ral249/Series
cambios
a
Merge branch 'master' of https://github.com/ral249/Series