No change....
fixed merge prablems
Merge branch 'master' of https://github.com/FJ6855/Project

Conflicts:
	game
	res/LevelSegments/levelSegment0.txt
Added a few Levelsegments
Merge branch 'master' of https://github.com/FJ6855/Project

Conflicts:
	res/HighScore.txt
	res/LevelSegments/levelSegment0.txt