new file:   kibitaki.rb
	modified:   sublimetext3-crack.rb
	modified:   ../.DS_Store
Merge branch 'master' of https://github.com/fainder/homebrew-mycask

Conflicts:
	Casks/sublimetext3-crack.rb