merge keyboardquiz into master

let's do it