revert shot
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab

Conflicts:
	ProjetFinal/GameStateComputeSimulation.m
revert shot
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab