up
Merge branch 'master' of https://github.com/oxidase/home

Conflicts:
	.emacs
up