add 'cp -i alias'
resolve conflict
fix javascript indent for vim
Resolved conflict
Add Brewfile
Merge branch 'master' of github.com:tatsuyafw/dotfiles
Update Brewfile
add vagrant settings
Merge pull request #45 from tatsuyafw/master

add 'cp -i alias'