function change
Merge branch 'master' of https://github.com/daniellytle/Disco-Cloud
function change