ultima versopm
Merge remote-tracking branch 'origin/master'

Conflicts:

	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Cliente/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Cliente/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Repositorio/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Repositorio/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.indexes/7/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.indexes/e4/3/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.indexes/e4/72/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1488091816.index
Merge branch 'master

Conflicts:

	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Cliente/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Cliente/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Repositorio/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Repositorio/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.indexes/7/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.indexes/e4/3/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.indexes/e4/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TPO.Server/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1488091816.index
	TPO.Cliente/bin/Inicio.class
Merge branch 'master' of https://github.com/ale42x/TPO-V2

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi