d
Merge branch 'master' of https://github.com/DL-Kazutaka/SourceTree

Conflicts:
	Sample/Sample/ViewController.m