Compilation et correction makefile
Merge branch 'master' of https://github.com/Barbatos/BatailleSpatiale

Conflicts:
	src/Makefile
	src/client/Cellule.cpp
	src/client/Cellule.hpp
	src/client/Evenement.hpp
	src/client/Plateau.cpp
	src/client/Plateau.hpp
	src/client/Position.hpp
	src/client/structures/Batiment.hpp
	src/client/structures/Vaisseau.hpp
	src/serveur/plateau/Cellule.cpp