CHANGES
Merge remote-tracking branch 'origin/master'

Conflicts:
	SP1Framework/UserInterface.cpp
	SP1Framework/leader board.txt
	SP1Framework/main.cpp
	SP1Framework/score.txt
	SP1Framework/score1.txt
	SP1Framework/score2.txt
	SP1Framework/score3.txt
Merge branch 'master' of https://github.com/gigasii/SP1Framework

Conflicts:
	SP1Framework/UserInterface.cpp
	SP1Framework/score.txt
	SP1Framework/score2.txt