updated based on comments from cantino
Merge pull request #96 from albertsun/asset-deploys

Asset deploys
Merge branch 'master' into deploy