first commit from laptop

All solutions
Merge remote-tracking branch 'origin/laptop'