error handling for choosing user
switching to laptop
error handling
Merge branch 'master' into gh-pages