part 2
Merge branch 'master' of https://github.com/Securosis/CloudFileStorageAndCollaboration

Conflicts:
	Cloud Storage and Collaboration Security.md