Refactoring
Refactoring
Merged
Merge branch 'master' of https://github.com/DanielaStamati/SocialFileTransfer

Conflicts:
	SocialFileTransfer/src/main/Main.java