update
hoge
Merge branch 'master' of github.com:yayugu/environment

Conflicts:
	home/.vimrc