Tiens ton commit
Merge branch 'mhdsjibfsaster' of https://github.com/jmcomets/EUSDAB

Conflicts:
	include/character.h