highscore
Merge branch 'Marcus' into testmerge

Conflicts:
	TrialsOfGoku/Base.lproj/Main.storyboard