highscore conflict
Merge branch 'master' of https://github.com/Stan-Kerstjens/Pentris.git

Conflicts:
	Pentris/HighScores.txt
Merge branch 'master' of https://github.com/Stan-Kerstjens/Pentris.git
Merge branch 'master' of https://github.com/Stan-Kerstjens/Pentris.git
GameData javadoc