merged files from laptop and updated a few things