..
..
Merge branch 'master' of https://github.com/alxio/ify

Conflicts:
	doc/inzynierka.pdf
Merge branch 'master' of https://github.com/alxio/ify
Merge branch 'master' of https://github.com/alxio/ify