working serverconf
First working text
Merge branch 'master' of https://github.com/srirams6/split-server

Conflicts:
	.gitignore
	lib/metadata.py
	server.py
	working/user_reg.py