laptop diff
laptop merge
Merge branch 'master' of github.com:krzym/config
rc.lua theme update