in game menu done still need to add oen check in it and maybe some info
Merge branch 'master' of https://github.com/justia02/PSI-team-3
Merge remote-tracking branch 'origin/master' into threading

Conflicts:
	PSI Team 3/PSI Team 3/MenuEventReceiver.cpp
	PSI Team 3/PSI Team 3/game.cpp