fixed merge issue
changes to rc.lua
tried to get seconds displayed in the clock
Merge remote-tracking branch 'origin/master' into laptop
made latex text width 100 chars, to fit half laptop screen nicely.
Merge branch 'master' into laptop