Tmux status changes
Merge branch 'master' into work-env
Tmux status bar add uptime
Merge branch 'master' into work-env