commit for merge
Merge branch 'master' of https://github.com/Timoran/hocuspocus

Conflicts:
	src/main/java/com/cpe/aaync/hocuspocus/model/Player.java
	src/main/java/com/cpe/aaync/hocuspocus/model/cartes/pocus/Amulet.java
Merge branch 'master' of https://github.com/Timoran/hocuspocus