ajout image epee
Merge branch 'master' of https://github.com/tonymx227/echek.fr

Conflicts:
	css/screen.css
Merge branch 'master' of https://github.com/tonymx227/echek.fr

sons
Merge branch 'master' of https://github.com/tonymx227/echek.fr

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/tonymx227/echek.fr
deplacement cellule adj lors de l attaque + suppression de l unite attaque (atm)
+ bloque le click lors que le tour du joueur n est pas termine
ajout des points de vie, gestion des dega, suppression des personnages tuer
ajout test title
Merge branch 'master' of github.com:synry63/echek.fr

test pull patrick master