.
Merge branch 'master' of https://github.com/dharo/Projectv2_47982

Conflicts:
	Project 2/BattleShipSalvo/build/Debug/GNU-MacOSX/main.o
	Project 2/BattleShipSalvo/dist/Debug/GNU-MacOSX/battleshipsalvo