...
...
Merge branch 'master' of
https://github.com/germansturtz/ClienteServidor.git

Conflicts:
	cinemania/src/main/java/cinemania/controladores/HomeController.java