testes
Merge branch 'master' of github.com:vios-fish/dotfiles

Conflicts:
	.emacs.d/Cask
	.emacs.d/init_loader/00-base.el
	.emacs.d/init_loader/03_font.el
	.emacs.d/init_loader/13_migemo.el
	.emacs.d/init_loader/37_yatex.el
	.emacs.d/setup.el
	.zshrc
aiueo