displaying time in tray and starting timeclock on every emacs startup
added fonts.dir to .gitignore
Merge branch 'master' of github.com:hanslovsky/config
resolved merging conflict