'Merge' branch 'laptop' into master
added .zshrc to common files
'Merge' branch 'laptop' into master
'Merge' branch desktop into master
Merge branch 'master' into laptop