professor question
register

register
Merge remote-tracking branch 'origin/feature/homepage' into feature/homepage

Conflicts:
	api/controllers/AuthController.js
	api/services/protocols/local.js
Merge branch 'feature/homepage' of https://github.com/uccor/labit into feature/homepage
merge homepage
make question fixed
Mejora grafica del fondo
Merge remote-tracking branch 'origin/feature/homepage' into feature/homepage
Merge remote-tracking branch 'origin/feature/question' into feature/question

Conflicts:
	assets/styles/question.css
Se arreglaron los margenes del boton de registracion
fixed toastr and / in path
Merge remote-tracking branch 'origin/feature/question' into feature/courseManager

Conflicts:
	assets/styles/professor.css
	assets/styles/question.css
Merge branch 'master' into feature/courseManager
Merge remote-tracking branch 'origin/feature/homepage' into feature/courseManager
fixed pdf sharing and course being finished
Merge remote-tracking branch 'origin/feature/homepage' into feature/courseManager
Se agrego boton de logout
Merge remote-tracking branch 'origin/feature/homepage' into feature/courseManager

Conflicts:
	views/layout.ejs