General Strategy =
conflits que je pige pas
Merge branch 'master' of https://github.com/blegat/LFSAB1507

Conflicts:
	report/GeneralStrategy/GeneralStrategy.tex