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