gitignore

gix
Merge branch 'master' of https://github.com/svemirko/pkf

Conflicts:
	.gitignore