just changed 1 line in application.js to include kirsten's keyboard.js
fixed merge conflicts
fixed timer
fixed merge conflicts