subfig -> subcaption. (captionsetup By alick9188, thanks)
Merge pull request #49 from lockehamann/subcaption

subfig -> subcaption