Modified for laptop
Merge remote-tracking branch 'origin/master'
Separate files for lab and laptop. Not ambiguous anymore