criteo adjustments
Added todo example in status bar
Adapt to new machine
Update
Merge branch 'criteo' of github.com:kamaradclimber/Dotfiles

* 'criteo' of github.com:kamaradclimber/Dotfiles:
  Update
  criteo adjustments

Conflicts:
	.bashrc
	.xinitrc
Add lock shortcut