Guitar now tracks which buttons are being pressed
Merge remote-tracking branch 'origin/master'