merged laptop 1 code with master