game update
Merge branch 'master' of https://github.com/trl10254/KhanHamza_CSC11_48598

Conflicts:
	Midterm/Midterm (Windows Editon)/main.cpp
	Midterm/Midterm (Windows Editon)/nbproject/private/private.xml
	Midterm/Midterm/MainMenu.s
	Midterm/Midterm/Problem1.s
	Midterm/Midterm/Problem2.s
	Midterm/Midterm/Problem3.s