first commit
Merge branch 'master' of https://github.com/nobuyuki0717/dotfiles

Conflicts:
	_vimrc