namePlates
Merge branch 'master' of https://github.com/Aldrian/projetPoney.git

Conflicts:
	src/Interface/AnimatorCountDown.java