Update packages every nth day! (Very hacky)
Merge branch 'master' of github.com:larstvei/dot-emacs

Conflicts:
	init.el
	init.org
fixing merge conflict?