C++
C++
Merge branch 'master' of https://github.com/ibaiGilabert/AsiyaGPU

Conflicts:
	lib/Asiya.cpp
	lib/Config.cpp
	lib/InOut/TB_FORMAT.cpp
	lib/Scoring/Core.cpp
	lib/Scoring/Process.cpp
	lib/Scoring/ROUGE.cpp
	lib/Scoring/Scores.cpp