Mon Jan 20 11:08:36 JST 2014
Merge branch 'master' of github:Paul-U/Home

Conflicts:
	.emacs.d/init.d/20-anything.el
	.emacs.d/init.d/40-orgmode.el
	.zshrc