'Merge' branch 'laptop' into master
Merge branch 'master' into desktop
added calibre viewer keybinds