Menu class added, mapterrain added
Merge branch 'master' of https://github.com/justia02/PSI-team-3

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