Merge
update .gitignore
Merge branch 'master' of https://github.com/tan-yuki/myHome

Conflicts:
	.vimrc
update ftplugin setting