Added more levelsegments
Fixed merge errors.
Merge branch 'master' of https://github.com/FJ6855/Project

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