client 12
Merge branch 'master' of https://github.com/bengus28/Networks2

Conflicts:
	Lab1/client12.c
	Lab1/server12.py
again.