knocker options in the settings menu now - and fixed a high score bug
Merge remote-tracking branch 'origin/master'