apache2 v gitignore
Merge branch 'master' of github.com:zgemba/pksk