delete ds store
diffをvimdiffにした
Merge pull request #1 from RazeLiberty/masterBU

Master bu