Corregidos conflictos y algún error de inicialización
	modified:   CygnusCloud/controllers/main.py
	modified:   CygnusCloud/controllers/teacher.py
	modified:   CygnusCloud/static/progressBar.html
	modified:   CygnusCloud/views/administrator/servers.html