fixed createBlockBlobFromLocalFile function name in storage documentation
fixing merge conflict #1917
fixing merge conflict #1917
Merge pull request #1918 from mollybostic/master_0710

fixing merge conflict