Change locale
Merge branch 'master' of https://github.com/Faterou/TP1_Genie

Conflicts:
	Token.cpp