task 5
Merge branch 'master' of https://github.com/zlotylesk/pto2014_KK into develop
Merge pull request #2 from zlotylesk/develop

Develop