Commit super bizarro
Cambios para correr en el cluster

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Makefile
	src/face_detector.cpp
	src/face_film.cpp
	src/face_generator.cpp
	src/face_generator.h
	src/utils.h
	utils/config.json
	utils/img_downloader.py
Merge remote-tracking branch 'origin/master'