file_sh2.0
Merge https://github.com/alexcazacu/file_sharing2.0

Conflicts:
	README.md