update
Merge branch 'master' of https://github.com/dkyun77/dev_life

Conflicts:
	bin/_vimrc