Merging 'merging_assets' branch to 'master'.
Merge branch 'master' of github.com:jmervine/api-docs