add work edits
Merge branch 'master' into work
fix merge conflicts
fix merge conflicts, merge new xmonad config