rapport + uigamemain (mini modif)

tite modif en cours
Merge branch 'master' of https://github.com/bastiangardel/Naval_Battle
chti chmt
Merge branch 'master' of https://github.com/bastiangardel/Naval_Battle

Conflicts:
	Rapport de Projet/Rapport_GEN.docx