.
.
z
Merge branch 'master' of https://github.com/mroland/SapWebEscrita.git

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
.
.
.
Merge branch 'master' of https://github.com/mroland/SapWebEscrita.git

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
.
Merge branch 'master' of git@github.com:mroland/SapWebEscrita.git
.
z
.
Merge branch 'master' of git@github.com:mroland/SapWebEscrita.git
.
z
Merge branch 'master' of https://github.com/mroland/SapWebEscrita.git

Conflicts:
	WebContent/pages/login.xhtml