pruebas
Merge branch 'master' of github.com:jairoserrano/HPCFront

Conflicts:
	app/controllers/JobsController.php