Generacion de video usando ffmpeg
Merge branch 'cluster' of github.com:vierja/hpc-facedetection into cluster

* 'cluster' of github.com:vierja/hpc-facedetection:
  Cambios para correr en el cluster
  Commit super bizarro

Conflicts:
	src/Makefile
	src/face_film.cpp
	src/face_generator.cpp
Borro libs agregadsa por accidente