huga
hoga
Merge branch 'master' of https://github.com/taichouchou2/dotfiles

Conflicts:
	.config/powerline/colorschemes/ipython/default.json
	.config/powerline/colorschemes/shell/solarized.json
	.config/powerline/colorschemes/tmux/default.json
	.config/powerline/colorschemes/vim/default.json
	.config/powerline/colorschemes/wm/default.json
	.config/powerline/config.json
	.config/powerline/themes/tmux/default.json
	.config/powerline/themes/vim/previewwindow.json
	.config/powerline/themes/vim/tagbar.json
hoge
hoge