Merge pracy -> master
Merge branch 'master' of github.com:paweljw/engths2013
Co ja mam z tym bajzlem w kernelach...