upthere version
Merge branch 'master' of github.com:nikki93/.emacs.d

Conflicts:
	init.el
whatever