srv implementation starts
errors added
srv fixed
Merge branch 'srv'

Conflicts:
	proto.c