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

Conflicts:
	tests/client.py
	tests/client.pyc
	tests/db/file_sharing_alex0.db
	tests/db/file_sharing_alex1.db
	tests/db/file_sharing_alex2.db
	tests/settings.pyc
	tests/test.py
	tests/test.pyc