other tmp dir
ftd for go
Merge remote branch 'origin/master'

Conflicts:
	vimrc