up
Merge branch 'master' of https://github.com/alexcazacu/file_sharing

Conflicts:
	client.pyc
	server.py
	server.pyc
	settings.py
	settings.pyc
Merge branch 'master' of https://github.com/alexcazacu/file_sharing

Conflicts:
	client.pyc
	settings.pyc