updated dict (laptop)
Merge remote-tracking branch 'origin/master'