viewDidLoad changed
Merge remote-tracking branch 'origin/master2' into JSON1
master2をpullした2