se corrige controllers

TODO, separarlo a ficheros aparte
Merge branch 'master' of https://github.com/KarlaU/Corporacion-Amereida

Conflicts:
	server.js
	static/css/camereida.css