highscore now takes cumulative score and mapName
Merge branch 'highscoreUpdated'. Fixed issues caused by all the conflicting files

Conflicts Resolved:
	SP1Framework/SP1Framework.vcxproj.filters
	SP1Framework/game.cpp