Added some comments & minor changes
Merge branch 'master' of https://github.com/chrisittner/lmu-sysprak-ws2012

Conflicts:
	client.c