Final UPDATE
Merge remote-tracking branch 'origin/master'

Conflicts:
	bleu.html
	main.js
	rouge.html
New Update final