template 3
	modified:   Hajaee_2.aux
	modified:   Hajaee_2.blg
	modified:   Hajaee_2.log
	modified:   Hajaee_2.pdf
	modified:   Hajaee_2.tex
	modified:   Hajaee_2.tex.backup
	modified:   Hajaee_2.tex~
Merge branch 'master' of github.com:hanskompis/okp

Conflicts:
	Hajaee_2.log
	Hajaee_2.pdf

	new file:   .Hajaee_2.tex.kate-swp
	new file:   .nfs000000000c482ef1000000d4
	modified:   Hajaee_2.aux
	deleted:    Hajaee_2.log
	deleted:    Hajaee_2.pdf
	deleted:    OKP_1_Hajaee.pdf