Corrected compilation errors after changing library code
Merge branch 'master' of github.com:justia02/PSI-team-3

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