Merge branch desktop into master
"Merge" branch desktop into master
'Merge' branch laptop into master
temp
updated .pentadactylrc