Add indent setting for markdown
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim/.vimrc.indent
Merge branch 'master' of github.com:yuya-takeyama/dotfiles
Fix configuration order
Disable cjkwidth of screen