started fixing errors in test classes, added main menu button to new game menu
fixed render for main menu button in high score view
merge
fixed merge conflicts