game modificated
Merge branch 'master' of https://github.com/agustinrodriguez/orga2_tp3

Conflicts:
	src/game.c