score p1 et p2
Merge branch 'master' of https://github.com/mdevlamynck/yasw

Conflicts:
	src/Game.cpp
	src/Game.hpp