Server paper vol.1.3.1
Merge branch 'master' of https://github.com/alxio/ify

Conflicts:
	doc/inzynierka.tex