its benchmarking time
more fixing stuff
Merge branch 'master' of https://github.com/leyven/Cuatrimestre-7

Conflicts:
	app/views/AdminAyuda.blade.php