Added Paweł to authors
resolved conflicts
Merge pull request #4 from zpp-2014-15/branch_author

Added Paweł to authors