merged maps branch, added challenges view/highscore