add pep 8 #r Please enter the commit message for your changes. Lines starting
Merge branch 'test_refactoring' of https://github.com/fmarco/share-system-team1 into test_refactoring
refactoring
Merge branch 'test_refactoring' of https://github.com/fmarco/share-system-team1 into test_refactoring

Conflicts:
	server/test_server.py