Commit pour que github me fasse pas chier
Merge branch 'master' of https://github.com/TeamGoatDev/InstintoMexicano

Conflicts:
	src/Character.hpp