ui colorをautoにした
Merge branch 'master' of https://github.com/RazeLiberty/dotfiles
.DS_Storeを無視
Merge branch 'master' of https://github.com/RazeLiberty/dotfiles

Conflicts:
	.DS_Store